remove rkyv warnings from xous-api-names

This commit is contained in:
bunnie 2022-10-10 03:16:40 +08:00
parent 94aa4b62b1
commit f8a2ea51bb
43 changed files with 77 additions and 60 deletions

View file

@ -3,7 +3,7 @@ authors = ["bunnie <bunnie@kosagi.com>"]
description = "Xous microkernel OS inter-process name resolution server"
edition = "2018"
name = "xous-api-names"
version = "0.9.7"
version = "0.9.8"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/"

View file

@ -1,3 +1,6 @@
mod rkyv_enum;
pub use rkyv_enum::*;
#[allow(dead_code)]
pub const AUTHENTICATE_TIMEOUT: u32 = 10_000; // time in ms that a process has to respond to an authentication request
@ -51,25 +54,6 @@ pub enum Opcode {
BlockingConnect = 6,
}
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
#[repr(C)]
pub enum Return {
/// The caller must perform an AuthenticatedLookup using this challenge
AuthenticateRequest(AuthenticateRequest),
/// The connection failed for some reason
Failure,
/// A server was successfully created with the given SID
SID([u32; 4]),
/// A connection was successfully made with the given CID; an optional "disconnect token" is provided
CID((xous::CID, Option<[u32; 4]>)),
/// Operation requested was otherwise successful (currently only used by disconnect to ack the disconnect)
Success,
}
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
pub struct Registration {
pub name: xous_ipc::String<64>,

View file

@ -0,0 +1,33 @@
// As of Rust 1.64.0:
//
// Rkyv-derived enums throw warnings that rkyv::Archive derived enums are never used
// and I can't figure out how to make them go away. Since they spam the build log,
// rkyv-derived enums are now isolated to their own file with a file-wide `dead_code`
// allow on top.
//
// This might be a temporary compiler regression, or it could just
// be yet another indicator that it's time to upgrade rkyv. However, we are waiting
// until rkyv hits 0.8 (the "shouldn't ever change again but still not sure enough
// for 1.0") release until we rework the entire system to chase the latest rkyv.
// As of now, the current version is 0.7.x and there isn't a timeline yet for 0.8.
#![allow(dead_code)]
use crate::api::AuthenticateRequest;
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
#[repr(C)]
pub enum Return {
/// The caller must perform an AuthenticatedLookup using this challenge
AuthenticateRequest(AuthenticateRequest),
/// The connection failed for some reason
Failure,
/// A server was successfully created with the given SID
SID([u32; 4]),
/// A connection was successfully made with the given CID; an optional "disconnect token" is provided
CID((xous::CID, Option<[u32; 4]>)),
/// Operation requested was otherwise successful (currently only used by disconnect to ack the disconnect)
Success,
}

View file

@ -12,7 +12,7 @@ homepage = "https://betrusted.io/xous-book/"
[dependencies]
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
xous-ipc = "0.9.13"
num-derive = {version = "0.3.3", default-features = false}

View file

@ -18,7 +18,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", version = "0.9.5"}
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
xous-semver = "0.1.2"
[features]

View file

@ -14,7 +14,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
gam = {path = "../../services/gam" }
trng = {path = "../../services/trng"}
modals = {path = "../../services/modals"}

View file

@ -10,7 +10,7 @@ num-traits = {version = "0.2.14", default-features = false}
xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}

View file

@ -14,7 +14,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}

View file

@ -11,7 +11,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
log-server = { package = "xous-api-log", version = "0.1.7" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}

View file

@ -14,7 +14,7 @@ cbor = { path = "../cbor" }
arrayref = "0.3.6"
subtle = { version = "2.2.3", default-features = false}
trng = {path = "../../../../services/trng"}
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
rand_core = "0.6.3"
p256 = {version = "0.10.1", default-features = false, features = ["ecdsa", "ecdh", "std"]}
cbc = "0.1.2"

View file

@ -30,7 +30,7 @@ js-sys = { version = "0.3", optional = true }
wasm-bindgen-test = "0.3.18"
[target.'cfg(target_os = "xous")'.dependencies]
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
xous = "0.9.13"
xous-ipc = "0.9.13"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -10,7 +10,7 @@ description = "Audio CODEC server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.5"}
llio = {path = "../llio"}

View file

@ -15,7 +15,7 @@ susres = {package = "xous-api-susres", version = "0.9.5"}
typenum = "1.12"
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
trng = {path = "../trng"}
llio = {path = "../llio"}

View file

@ -10,6 +10,6 @@ description = "Content Canvas Plugin Common APIs"
xous = "0.9.13"
rkyv = { version = "0.4.3", default_features = false }
graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API
xous-names = {package = "xous-api-names", version = "0.9.7"} # used by the IMEF for registering listeners
xous-names = {package = "xous-api-names", version = "0.9.8"} # used by the IMEF for registering listeners
log = "0.4.14"

View file

@ -10,7 +10,7 @@ description = "Xous DNS resolver"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,7 +10,7 @@ description = "Curve25519 Engine"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.5"}
llio = {path = "../llio"} # temporary for testing some power stuff

View file

@ -10,7 +10,7 @@ description = "Sha512 hardware accelerator engine"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.5"}
trng = { path = "../trng" }

View file

@ -10,7 +10,7 @@ description = "FFI test integration"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -19,7 +19,7 @@ ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
trng = {path = "../trng"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -15,7 +15,7 @@ susres = {package = "xous-api-susres", version = "0.9.5"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
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"]}

View file

@ -17,7 +17,7 @@ ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
locales = {path = "../../locales"}
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -11,7 +11,7 @@ graphics-server = {path = "../graphics-server"}# this is used by the IMEF portio
log = "0.4.14"
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}# used by the IMEF for registering listeners
xous-names = {package = "xous-api-names", version = "0.9.8"}# used by the IMEF for registering listeners
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -13,7 +13,7 @@ log-server = {package = "xous-api-log", version = "0.1.7"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -13,7 +13,7 @@ log-server = {package = "xous-api-log", version = "0.1.7"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,7 +10,7 @@ description = "JTAG port server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -12,7 +12,7 @@ log-server = {package = "xous-api-log", version = "0.1.7"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
llio = {path = "../llio"}
susres = {package = "xous-api-susres", version = "0.9.5"}
spinor = {path = "../spinor"}

View file

@ -10,7 +10,7 @@ description = "libstd test stub"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -12,7 +12,7 @@ log-server = {package = "xous-api-log", version = "0.1.7"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
susres = {package = "xous-api-susres", version = "0.9.5"}
# RTC dependencies

View file

@ -10,7 +10,7 @@ description = "Ux modals server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -11,7 +11,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -12,7 +12,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,7 +10,7 @@ description = "Xous root keys server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.5"}
trng = {path= "../trng"}

View file

@ -20,7 +20,7 @@ log-server = {package = "xous-api-log", version = "0.1.7"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.5"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
keyboard = {path = "../keyboard"}
susres = {package = "xous-api-susres", version = "0.9.5"}
codec = {path = "../codec"}

View file

@ -10,7 +10,7 @@ description = "Audio CODEC server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,7 +10,7 @@ description = "SPINOR ROM operations server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.5"}
trng = { path = "../trng" }

View file

@ -16,7 +16,7 @@ trng = {path = "../trng"}
llio = {path = "../llio"}
xous = "0.9.13"
xous-ipc = "0.9.13"
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
graphics-server = {path = "../graphics-server"}
gam = {path = "../gam"}
locales = {path = "../../locales"}

View file

@ -10,7 +10,7 @@ description = "TRNG server"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -11,7 +11,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -11,7 +11,7 @@ xous = "0.9.13"
xous-ipc = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
llio = {path="../llio"}
num-derive = {version = "0.3.3", default-features = false}

View file

@ -10,7 +10,7 @@ description = "USB test & development stub"
xous = "0.9.13"
log-server = { package = "xous-api-log", version = "0.1.7" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.5" }
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,7 +10,7 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-names = { package = "xous-api-names", version = "0.9.7" }
xous-names = { package = "xous-api-names", version = "0.9.8" }
xous-api-susres = { version = "0.9.5" }
log-server = { package = "xous-api-log", version = "0.1.7" }
xous = "0.9.13"

View file

@ -10,7 +10,7 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-names = {package = "xous-api-names", version = "0.9.7"}
xous-names = {package = "xous-api-names", version = "0.9.8"}
log-server = {package = "xous-api-log", version = "0.1.7"}
susres = {package = "xous-api-susres", version = "0.9.5"}
xous-api-ticktimer = { version = "0.9.5" }

View file

@ -9,7 +9,7 @@ use crate::DynError;
pub fn check_project_consistency() -> Result<(), DynError> {
let check_pkgs = [
"xous-api-names@0.9.7",
"xous-api-names@0.9.8",
"xous-api-log@0.1.7",
"xous-api-susres@0.9.5",
"xous-api-ticktimer@0.9.5",