restructure the crate
Some checks are pending
Rust/sat-rs/pipeline/head Build started...

- Add new shared subcrate satrs-shared to split off some shared
  components not expected to change very often.
- Renmame `satrs-core` to `satrs`. It is expected that sat-rs will remain
  the primary crate, so the core information is superfluous, and core also
  implies stability, which will not be the case for some time.
This commit is contained in:
2024-02-12 14:27:22 +01:00
parent f58a4eaee5
commit 3ea3a7acb6
86 changed files with 180 additions and 151 deletions

View File

@ -22,8 +22,12 @@ serde-hex = "0.1.0"
version = "1"
optional = true
[dependencies.satrs-core]
version = "0.1.0-alpha.3"
[dependencies.satrs-shared]
path = "../satrs-shared"
features = ["serde"]
# [dependencies.satrs-core]
# version = "0.1.0-alpha.3"
# path = "../satrs-core"
# git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git"
# branch = "main"

View File

@ -19,12 +19,10 @@ path = "tests/tests.rs"
quote = "1"
proc-macro2 = "1"
[dependencies.satrs-core]
version = "0.1.0-alpha.3"
# path = "../../satrs-core"
# git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git"
# branch = "main"
# rev = "35e1f7a983f6535c5571186e361fe101d4306b89"
[dependencies.syn]
version = "2"
features = ["full"]
[dev-dependencies]
trybuild = { version = "1", features = ["diff"] }
@ -32,6 +30,10 @@ trybuild = { version = "1", features = ["diff"] }
[dev-dependencies.satrs-mib]
path = ".."
[dependencies.syn]
version = "2"
features = ["full"]
[dev-dependencies.satrs-shared]
# version = "0.1.0-alpha.3"
path = "../../satrs-shared"
# git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git"
# branch = "main"
# rev = "35e1f7a983f6535c5571186e361fe101d4306b89"

View File

@ -1,6 +1,6 @@
//! Basic check which just verifies that everything compiles
use satrs_core::res_code::ResultU16;
use satrs_mib::resultcode;
use satrs_shared::res_code::ResultU16;
#[resultcode]
const _TEST_RESULT: ResultU16 = ResultU16::const_new(0, 1);

View File

@ -1,6 +1,6 @@
//! Basic check which just verifies that everything compiles
use satrs_core::res_code::ResultU16;
use satrs_mib::resultcode;
use satrs_shared::res_code::ResultU16;
#[resultcode(info = "This is a test result where the first parameter is foo")]
const _TEST_RESULT: ResultU16 = ResultU16::const_new(0, 1);

View File

@ -1,6 +1,6 @@
use satrs_core::res_code::ResultU16;
use satrs_mib::res_code::ResultU16Info;
use satrs_mib::resultcode;
use satrs_shared::res_code::ResultU16;
#[resultcode(info = "This is a test result where the first parameter is foo")]
const TEST_RESULT: ResultU16 = ResultU16::const_new(0, 1);

View File

@ -1,7 +1,7 @@
#[cfg(feature = "std")]
pub use stdmod::*;
pub use satrs_core::res_code::ResultU16;
pub use satrs_shared::res_code::ResultU16;
use serde::{Deserialize, Serialize};
use serde_hex::{SerHex, StrictCapPfx};
@ -96,8 +96,8 @@ mod tests {
// Special solution for this crate because the code generated by a macro will use
// satrs_mib::res_code::*
use crate as satrs_mib;
use satrs_core::res_code::ResultU16;
use satrs_mib::resultcode;
use satrs_shared::res_code::ResultU16;
#[derive(Debug)]
#[allow(dead_code)]
@ -119,12 +119,12 @@ mod tests {
NOT_ENOUGH_APP_DATA_EXT,
];
const CSV_NAME: &'static str = "dummy.csv";
const CSV_NAME: &str = "dummy.csv";
#[test]
fn test_printout() {
let mut wtrb = csv::WriterBuilder::new();
wtrb.delimiter(';' as u8);
wtrb.delimiter(b';');
print_resultcodes_as_csv(wtrb, TMTC_RESULTS).expect("Priting result codes failed");
}
@ -133,7 +133,7 @@ mod tests {
let csvpath = Path::new(CSV_NAME);
let mut wtrb = csv::WriterBuilder::new();
let file = File::create(csvpath).expect("Creating CSV file failed");
wtrb.delimiter(';' as u8);
wtrb.delimiter(b';');
write_resultcodes_to_csv(wtrb, TMTC_RESULTS, file).expect("CSV export failed");
assert!(csvpath.exists());
let file = File::open(csvpath).expect("Opening CSV file failed");