diff --git a/Cargo.lock b/Cargo.lock index bd27d94e3..d39635f8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7361,8 +7361,6 @@ dependencies = [ [[package]] name = "xous-api-ticktimer" version = "0.9.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f7c2e99be732f306635541de965b93affc7923f31055eea2c9b85fdd0c478" dependencies = [ "log", "num-derive 0.4.2", @@ -7505,9 +7503,9 @@ dependencies = [ [[package]] name = "xous-semver" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b79d97eaeab0fdf766f7f2c8d3b88bdae67ad36fac9694e2857defca345178c" +checksum = "906500be0c4ed13afc3c8743e4d40337bfbe08e7dadfa216c39907aaa06cc8c2" [[package]] name = "xous-susres" diff --git a/Cargo.toml b/Cargo.toml index a259bdabd..14cb5361d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,8 +215,8 @@ path = "./svd2utra" # path = "./api/xous-api-susres" # [patch.crates-io.xous-api-log] # path = "./api/xous-api-log" -# [patch.crates-io.xous-api-ticktimer] -# path = "./api/xous-api-ticktimer" +[patch.crates-io.xous-api-ticktimer] +path = "./api/xous-api-ticktimer" # [patch.crates-io.xous-tts-backend] # path = "../tts-backend" diff --git a/api/xous-api-ticktimer/Cargo.toml b/api/xous-api-ticktimer/Cargo.toml index 973b8af95..2a5a41946 100644 --- a/api/xous-api-ticktimer/Cargo.toml +++ b/api/xous-api-ticktimer/Cargo.toml @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-semver = "0.1.2" +xous-semver = "0.1.5" [features] debug-print = [] diff --git a/api/xous-api-ticktimer/src/lib.rs b/api/xous-api-ticktimer/src/lib.rs index b7ecc0eba..4e44b045c 100644 --- a/api/xous-api-ticktimer/src/lib.rs +++ b/api/xous-api-ticktimer/src/lib.rs @@ -2,6 +2,8 @@ pub mod api; +use std::str::FromStr; + use num_traits::ToPrimitive; use xous::{CID, Error, send_message}; use xous_semver::SemVer; diff --git a/loader/src/phase1.rs b/loader/src/phase1.rs index 560e9b0ab..3e2241300 100644 --- a/loader/src/phase1.rs +++ b/loader/src/phase1.rs @@ -60,13 +60,13 @@ pub fn phase_1(cfg: &mut BootConfig, detached_app: bool) { } if VDBG { let check_iter = cfg.args.iter(); - for a in check_iter { + for _a in check_iter { crate::println!( "{}: base {:x} size {:x} data {:x?}", - core::str::from_utf8(&a.name.to_le_bytes()).unwrap_or("invalid name"), - a.this as usize, - a.size, - a.data + core::str::from_utf8(&_a.name.to_le_bytes()).unwrap_or("invalid name"), + _a.this as usize, + _a.size, + _a.data ); } } diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index a27d248b3..6acd82000 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -26,7 +26,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -xous-semver = "0.1.2" +xous-semver = "0.1.5" utralib = { version = "0.1.25", optional = true, default-features = false } diff --git a/services/com/src/main.rs b/services/com/src/main.rs index 8f6583622..a4551d532 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -1217,6 +1217,8 @@ fn main() -> ! { } fn parse_version(com: &mut crate::implementation::XousCom) -> u32 { + use std::str::FromStr; + use xous_semver::SemVer; // this feature was only introduced since 0.9.6. Unfortunately, there is no good way to figure out diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml index 1e9d50988..58444ac95 100644 --- a/services/llio/Cargo.toml +++ b/services/llio/Cargo.toml @@ -26,7 +26,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -xous-semver = "0.1.2" +xous-semver = "0.1.5" utralib = { version = "0.1.25", optional = true, default-features = false } diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index 0a5cca3db..f250f4dfb 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -34,7 +34,7 @@ utralib = { version = "0.1.25", optional = true, default-features = false } # for automatic SSID management and AP list storage pddb = { path = "../pddb" } -xous-semver = "0.1.2" +xous-semver = "0.1.5" [dependencies.smoltcp] version = "0.11.0" diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index c6d0f89ac..d599906c2 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -17,7 +17,7 @@ trng = { path = "../trng" } spinor = { path = "../spinor" } llio = { path = "../llio" } com = { path = "../com" } -xous-semver = "0.1.2" +xous-semver = "0.1.5" utralib = { version = "0.1.25", optional = true, default-features = false } blitstr2 = { path = "../../libs/blitstr2" } keystore-api = { path = "../../libs/keystore-api" } diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index d3512a032..be591a0ca 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -3088,6 +3088,8 @@ impl<'a> RootKeys { } pub fn staged_semver(&self) -> SemVer { + use std::str::FromStr; + let staging_meta = self.fetch_gw_metadata(GatewareRegion::Staging); if staging_meta.magic == 0x6174656d { let tag_str = @@ -3112,6 +3114,7 @@ impl<'a> RootKeys { /// The main utility of this function is to simplify the out of the box experience /// before root keys have been added. pub fn try_nokey_soc_update(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> bool { + use std::str::FromStr; if self.is_initialized() { log::warn!("No-touch update attempted, but keys are initialized. Aborting."); return false; diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 114129f3f..f9e4a1241 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -47,7 +47,7 @@ crossbeam = "0.8.2" sha2 = { version = "0.10.8" } digest = "0.10.7" -xous-semver = "0.1.2" +xous-semver = "0.1.5" com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } utralib = { version = "0.1.25", optional = true, default-features = false } diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index 487b7bbd9..29ffc032b 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -25,7 +25,7 @@ modals = { path = "../modals", optional = true } keyboard = { path = "../keyboard", features = ["inject-api"], optional = true } bitfield = "0.13.2" vcell = "0.1.3" -xous-semver = "0.1.2" +xous-semver = "0.1.5" utralib = { version = "0.1.25", optional = true, default-features = false } trng = { path = "../trng", optional = true } precursor-hal = { path = "../../libs/precursor-hal" } diff --git a/services/xous-ticktimer/Cargo.toml b/services/xous-ticktimer/Cargo.toml index 536a0a19b..39fe59608 100644 --- a/services/xous-ticktimer/Cargo.toml +++ b/services/xous-ticktimer/Cargo.toml @@ -23,7 +23,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-semver = "0.1.2" +xous-semver = "0.1.5" utralib = { version = "0.1.25", optional = true, default-features = false } loader = { path = "../../loader", optional = true } diff --git a/tools/Cargo.toml b/tools/Cargo.toml index d0b74d214..cd88766d1 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4.14" pem = "0.8.3" svd2utra = "0.1.23" xmas-elf = "0.9.0" -xous-semver = "0.1.3" +xous-semver = "0.1.5" ed25519-dalek = { version = "2.1.0", features = ["digest"] } sha2 = { version = "0.10.8" } pkcs8 = { version = "0.8.0", features = ["pem"] } diff --git a/tools/src/bin/sign-image.rs b/tools/src/bin/sign-image.rs index 8787df260..1e89a425b 100644 --- a/tools/src/bin/sign-image.rs +++ b/tools/src/bin/sign-image.rs @@ -5,6 +5,8 @@ use tools::sign_image::{convert_to_uf2, load_pem, sign_file}; const DEVKEY_PATH: &str = "devkey/dev.key"; +use std::str::FromStr; + use xous_semver::SemVer; fn main() -> Result<(), Box> {