From ae079cf504e80b5d69d8c8836879d5c68a9dfd3d Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 3 Oct 2022 00:25:03 +0800 Subject: [PATCH] bump lockfile --- Cargo.lock | 264 ++++++++++++++++++++++++++--------------------------- 1 file changed, 132 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index feea99542..dd5011496 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,7 +32,7 @@ dependencies = [ "hex-literal", "log", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", ] [[package]] @@ -66,7 +66,7 @@ dependencies = [ "hex-literal", "log", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", ] [[package]] @@ -174,12 +174,12 @@ dependencies = [ "modals", "num-derive", "num-traits", - "ticktimer-server", "trng", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -530,14 +530,14 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "trng", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -550,16 +550,16 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "trng", "typenum", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1044,13 +1044,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "trng", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -1167,13 +1167,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1284,12 +1284,12 @@ dependencies = [ "log", "num-derive", "num-traits", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1500,15 +1500,15 @@ dependencies = [ "qrcode", "rkyv", "sha2", - "susres", - "ticktimer-server", "trng", "tts-frontend", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1566,13 +1566,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1658,7 +1658,7 @@ dependencies = [ "num-traits", "tts-frontend", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", ] @@ -1792,13 +1792,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "tts-frontend", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -1824,12 +1824,12 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -1842,13 +1842,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "tts-frontend", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -1927,13 +1927,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -1947,10 +1947,10 @@ name = "kernel-test" version = "0.1.0" dependencies = [ "log", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", + "xous-ticktimer", ] [[package]] @@ -1963,13 +1963,13 @@ dependencies = [ "num-traits", "rkyv", "spinor", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -2019,11 +2019,11 @@ dependencies = [ "net", "num-derive", "num-traits", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-names", + "xous-ticktimer", ] [[package]] @@ -2037,14 +2037,14 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -2089,19 +2089,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "log-server" -version = "0.1.0" -dependencies = [ - "log", - "num-derive", - "num-traits", - "utralib", - "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", - "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "managed" version = "0.8.0" @@ -2213,14 +2200,14 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "trng", "tts-frontend", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -2254,15 +2241,15 @@ dependencies = [ "pddb", "rkyv", "smoltcp", - "susres", - "ticktimer-server", "trng", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -2525,15 +2512,15 @@ dependencies = [ "sha2", "spinor", "subtle", - "susres", - "ticktimer-server", "trng", "tts-frontend", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", "zeroize", "zeroize_derive", ] @@ -3002,12 +2989,12 @@ dependencies = [ "log", "num-derive", "num-traits", - "ticktimer-server", "trng", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", ] [[package]] @@ -3124,17 +3111,17 @@ dependencies = [ "sha2", "spinor", "subtle", - "susres", - "ticktimer-server", "trng", "tts-frontend", "usb-device-xous", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", "zeroize", ] @@ -3395,14 +3382,14 @@ dependencies = [ "num-traits", "opaque-debug", "rkyv", - "susres", - "ticktimer-server", "trng", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -3467,9 +3454,7 @@ dependencies = [ "sha2", "spectrum-analyzer", "spinor", - "susres", "threadpool", - "ticktimer-server", "tracing", "tracing-subscriber", "tracking-allocator", @@ -3482,9 +3467,11 @@ dependencies = [ "webpki-roots", "x25519-dalek", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -3576,14 +3563,14 @@ dependencies = [ "num-traits", "rand 0.7.3", "rkyv", - "susres", - "ticktimer-server", "trng", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -3639,16 +3626,16 @@ dependencies = [ "root-keys", "sha2", "sntpc", - "susres", - "ticktimer-server", "trng", "usb-device-xous", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -3669,21 +3656,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "susres" -version = "0.1.0" -dependencies = [ - "log", - "num-derive", - "num-traits", - "rkyv", - "utralib", - "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", - "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-names", -] - [[package]] name = "svd2repl" version = "0.1.0" @@ -3822,23 +3794,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "ticktimer-server" -version = "0.1.0" -dependencies = [ - "log", - "num-derive", - "num-traits", - "rkyv", - "susres", - "utralib", - "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", - "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-names", - "xous-semver", -] - [[package]] name = "time" version = "0.1.44" @@ -3979,13 +3934,13 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rkyv", - "susres", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -3997,12 +3952,12 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "ticktimer-server", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-ticktimer", "xous-tts-backend", ] @@ -4145,17 +4100,17 @@ dependencies = [ "rand 0.7.3", "rand_chacha 0.3.1", "rkyv", - "susres", - "ticktimer-server", "usb-device", "usbd-human-interface-device 0.2.1", "utralib", "vcell", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", "xous-semver", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -4170,15 +4125,15 @@ dependencies = [ "num-traits", "rand 0.7.3", "rand_chacha 0.3.1", - "susres", - "ticktimer-server", "usb-device", "usbd-human-interface-device 0.1.1", "utralib", "vcell", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -4272,16 +4227,16 @@ dependencies = [ "sha2", "sntpc", "subtle", - "susres", - "ticktimer-server", "trng", "tts-frontend", "usb-device-xous", "usbd-human-interface-device 0.2.1", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-names", + "xous-susres", + "xous-ticktimer", ] [[package]] @@ -4742,10 +4697,10 @@ dependencies = [ ] [[package]] -name = "xous-api-log-server" -version = "0.1.2" +name = "xous-api-log" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06526f026c0fe38565da702e9cea31fc9d0e940a3e94989aea1eb4b58033378" +checksum = "29fd7897ea38302043236a243a6ebaa78bbcdf1461ffb52e544583469d02deb6" dependencies = [ "log", "num-derive", @@ -4790,6 +4745,19 @@ dependencies = [ "xous-riscv", ] +[[package]] +name = "xous-log" +version = "0.1.0" +dependencies = [ + "log", + "num-derive", + "num-traits", + "utralib", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xous-names" version = "0.9.7" @@ -4800,7 +4768,7 @@ dependencies = [ "rkyv", "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log-server", + "xous-api-log", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4820,6 +4788,38 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ed3278bb4e7be4895c1c597434e5269f7357ffb800ebc644f0398bb008a15ad" +[[package]] +name = "xous-susres" +version = "0.1.0" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "utralib", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-names", +] + +[[package]] +name = "xous-ticktimer" +version = "0.1.0" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "utralib", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-names", + "xous-semver", + "xous-susres", +] + [[package]] name = "xous-tts-backend" version = "0.1.3"