diff --git a/services/dns/Cargo.toml b/services/dns/Cargo.toml index 2aca97e18..f18e2d1e0 100644 --- a/services/dns/Cargo.toml +++ b/services/dns/Cargo.toml @@ -16,8 +16,9 @@ num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } net = { path = "../net" } xous-ipc = "0.9.63" -rkyv = { version = "0.4.3", default-features = false, features = [ - "const_generics", +rkyv = { version = "0.8.8", default-features = false, features = [ + "std", + "alloc", ] } trng = { path = "../trng" } diff --git a/services/dns/src/hw.rs b/services/dns/src/hw.rs index 12c0ffc31..23d9b7e4a 100644 --- a/services/dns/src/hw.rs +++ b/services/dns/src/hw.rs @@ -4,7 +4,7 @@ use std::net::IpAddr; use net::NetIpAddr; use num_traits::ToPrimitive; use xous::CID; -use xous_ipc::{Buffer, String}; +use xous_ipc::Buffer; use crate::api::*; diff --git a/services/dns/src/main.rs b/services/dns/src/main.rs index 2467e5b44..e7a1bddc8 100644 --- a/services/dns/src/main.rs +++ b/services/dns/src/main.rs @@ -14,7 +14,7 @@ use api::*; use net::NetIpAddr; use num_traits::*; use xous::msg_scalar_unpack; -use xous_ipc::{Buffer, String}; +use xous_ipc::Buffer; // KISS DNS @@ -543,7 +543,7 @@ fn main() -> ! { let mut buf = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; let name = buf.to_original::, _>().unwrap(); - let name_std = std::string::String::from(name.as_str().unwrap()); + let name_std = std::string::String::from(name.as_str()); if let Some(cache_entry) = dns_cache.get(&name_std) { // pick a random entry let rand = resolver.trng_u32() as usize % cache_entry.len(); @@ -559,13 +559,13 @@ fn main() -> ! { } } } else { - match resolver.resolve(name.as_str().unwrap()) { + match resolver.resolve(name.as_str()) { Ok(cache_entry) => { if cache_entry.len() > 0 { dns_cache.insert(name_std, cache_entry); // now pick the entry back out again, as it was consumed... - let name_std = std::string::String::from(name.as_str().unwrap()); + let name_std = std::string::String::from(name.as_str()); let cache_entry = dns_cache.get(&name_std).unwrap(); // pick a random entry from the query response diff --git a/services/jtag/Cargo.toml b/services/jtag/Cargo.toml index 7a2367641..77987be5c 100644 --- a/services/jtag/Cargo.toml +++ b/services/jtag/Cargo.toml @@ -17,8 +17,9 @@ num-traits = { version = "0.2.14", default-features = false } susres = { package = "xous-api-susres", version = "0.9.59" } xous-ipc = "0.9.63" -rkyv = { version = "0.4.3", default-features = false, features = [ - "const_generics", +rkyv = { version = "0.8.8", default-features = false, features = [ + "std", + "alloc", ] } utralib = { version = "0.1.24", optional = true, default-features = false } diff --git a/services/test-swapper/Cargo.toml b/services/test-swapper/Cargo.toml index 919011b76..160a94cb7 100644 --- a/services/test-swapper/Cargo.toml +++ b/services/test-swapper/Cargo.toml @@ -19,8 +19,9 @@ log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -rkyv = { version = "0.4.3", default-features = false, features = [ - "const_generics", +rkyv = { version = "0.8.8", default-features = false, features = [ + "std", + "alloc", ] }