From 5402461794f82b6938f40595c679b9d524b1041e Mon Sep 17 00:00:00 2001 From: Vihaan Jim Date: Thu, 5 Oct 2023 17:15:25 -0400 Subject: [PATCH] Merge --- Cargo.lock | 317 +++++++++++++++++++------------------ apps/app-loader/Cargo.toml | 4 +- 2 files changed, 165 insertions(+), 156 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b58f1dbd0..fc8d32324 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,7 +67,7 @@ dependencies = [ "aes 0.8.1", "hex-literal", "log", - "xous", + "xous 0.9.51", "xous-api-log", ] @@ -124,11 +124,11 @@ dependencies = [ "rkyv", "ureq", "url", - "xous", + "xous 0.9.52", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -150,7 +150,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -295,11 +295,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -591,11 +591,11 @@ dependencies = [ "pddb", "rkyv", "trng", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -702,12 +702,12 @@ dependencies = [ "rkyv", "trng", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -733,12 +733,12 @@ dependencies = [ "trng", "typenum", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -790,7 +790,7 @@ dependencies = [ "graphics-server", "log", "rkyv", - "xous", + "xous 0.9.51", "xous-api-names", ] @@ -825,7 +825,7 @@ version = "0.1.0" dependencies = [ "log", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -841,7 +841,7 @@ dependencies = [ "num-derive", "num-traits", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -855,7 +855,7 @@ dependencies = [ "num-derive", "num-traits", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -1039,9 +1039,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1051,9 +1051,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1191,7 +1191,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1213,7 +1213,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1242,7 +1242,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1316,7 +1316,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1380,7 +1380,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1411,12 +1411,12 @@ dependencies = [ "trng", "userprefs", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -1436,12 +1436,12 @@ dependencies = [ "rkyv", "spinor", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -1591,12 +1591,12 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -1633,7 +1633,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1654,7 +1654,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1691,9 +1691,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" dependencies = [ "errno-dragonfly", "libc", @@ -1762,7 +1762,7 @@ dependencies = [ "num-derive", "num-traits", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -1851,7 +1851,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1863,7 +1863,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1928,7 +1928,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1985,12 +1985,12 @@ dependencies = [ "trng", "tts-frontend", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2051,9 +2051,9 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", "wasm-bindgen-test", - "xous", + "xous 0.9.51", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2086,12 +2086,12 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2173,10 +2173,10 @@ dependencies = [ "num-derive", "num-traits", "tts-frontend", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2348,11 +2348,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2364,9 +2364,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous", + "xous 0.9.51", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2379,11 +2379,11 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2398,11 +2398,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2512,12 +2512,12 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2535,7 +2535,7 @@ version = "0.1.0" dependencies = [ "log", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-ticktimer", ] @@ -2552,12 +2552,12 @@ dependencies = [ "rkyv", "spinor", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2633,7 +2633,7 @@ dependencies = [ "num-derive", "num-traits", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -2657,12 +2657,12 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -2715,9 +2715,9 @@ checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2821,11 +2821,11 @@ dependencies = [ "trng", "tts-frontend", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2857,11 +2857,11 @@ dependencies = [ "trng", "ureq", "url", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2887,11 +2887,11 @@ dependencies = [ "serde", "trng", "ureq", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -2927,12 +2927,12 @@ dependencies = [ "smoltcp", "trng", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -3330,12 +3330,12 @@ dependencies = [ "trng", "tts-frontend", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "zeroize", "zeroize_derive", ] @@ -3363,7 +3363,7 @@ version = "0.1.0" dependencies = [ "log", "utralib 0.1.23", - "xous", + "xous 0.9.51", ] [[package]] @@ -3579,9 +3579,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" dependencies = [ "once_cell", "protobuf-support", @@ -3590,9 +3590,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" +checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78" dependencies = [ "anyhow", "once_cell", @@ -3605,9 +3605,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" +checksum = "77d6fbd6697c9e531873e81cec565a85e226b99a0f10e1acc079be057fe2fcba" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -3621,9 +3621,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" +checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" dependencies = [ "thiserror", ] @@ -3783,7 +3783,7 @@ checksum = "8b86292cf41ccfc96c5de7165c1c53d5b4ac540c5bab9d1857acbe9eba5f1a0b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3906,11 +3906,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -3948,9 +3948,9 @@ dependencies = [ "spin 0.5.2", "untrusted", "winapi", - "xous", + "xous 0.9.51", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4011,12 +4011,12 @@ dependencies = [ "tts-frontend", "usb-device-xous", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", "zeroize", ] @@ -4062,9 +4062,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.15" +version = "0.38.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" dependencies = [ "bitflags 2.4.0", "errno", @@ -4237,7 +4237,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4259,7 +4259,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4322,12 +4322,12 @@ dependencies = [ "rkyv", "trng", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4353,9 +4353,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -4416,12 +4416,12 @@ dependencies = [ "usb-device-xous", "utralib 0.1.23", "x25519-dalek", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4488,7 +4488,7 @@ name = "spawn" version = "0.1.0" dependencies = [ "log", - "xous", + "xous 0.9.51", "xous-api-log", ] @@ -4521,12 +4521,12 @@ dependencies = [ "rkyv", "trng", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4582,12 +4582,12 @@ dependencies = [ "usb-device-xous", "userprefs", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -4660,9 +4660,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4752,7 +4752,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4779,7 +4779,7 @@ name = "ticktimer-test-client" version = "0.1.0" dependencies = [ "log", - "xous", + "xous 0.9.51", "xous-api-log", ] @@ -4864,11 +4864,11 @@ dependencies = [ "ureq", "webpki-roots 0.24.0", "x509-parser", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4923,7 +4923,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4981,10 +4981,10 @@ dependencies = [ "num-derive", "num-traits", "usb-device-xous", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -4999,12 +4999,12 @@ dependencies = [ "rand_core 0.5.1", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -5017,11 +5017,11 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-tts-backend", ] @@ -5174,12 +5174,12 @@ dependencies = [ "usbd_scsi 0.1.1", "utralib 0.1.23", "vcell", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -5199,7 +5199,7 @@ dependencies = [ "usbd-human-interface-device 0.1.1", "utralib 0.1.23", "vcell", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -5262,7 +5262,7 @@ dependencies = [ "typenum", "usb-device", "usbd_mass_storage 0.1.0", - "xous", + "xous 0.9.51", "xous-api-ticktimer", ] @@ -5336,7 +5336,7 @@ dependencies = [ "usb-device", "usbd_bulk_only_transport 0.1.0", "usbd_mass_storage 0.1.0", - "xous", + "xous 0.9.51", "xous-api-ticktimer", ] @@ -5423,12 +5423,12 @@ dependencies = [ "usbd-human-interface-device 0.2.1", "userprefs", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -5540,7 +5540,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5574,7 +5574,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5916,6 +5916,15 @@ dependencies = [ "rustc-std-workspace-core", ] +[[package]] +name = "xous" +version = "0.9.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf9d53b2052febeca453568bf0b36dc49cc5bf2e909026a85eba4bbb11b8ddb" +dependencies = [ + "lazy_static", +] + [[package]] name = "xous-api-log" version = "0.1.47" @@ -5923,8 +5932,8 @@ dependencies = [ "log", "num-derive", "num-traits", - "xous", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.51", + "xous-ipc 0.9.52", ] [[package]] @@ -5937,9 +5946,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous", + "xous 0.9.51", "xous-api-log", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -5953,10 +5962,10 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -5969,11 +5978,11 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -5983,18 +5992,18 @@ version = "0.9.51" dependencies = [ "bitflags 1.3.2", "rkyv", - "xous", + "xous 0.9.51", ] [[package]] name = "xous-ipc" -version = "0.9.51" +version = "0.9.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549eacc8d02d5e4c49559840fc3ec7f16e9a2c0a5bd27ae94da9c3e6ef9bc210" +checksum = "2b28aeb268628d175e4c61aa49f3a6587784c6c03fa7e1fc212f370d61537706" dependencies = [ "bitflags 1.3.2", "rkyv", - "xous", + "xous 0.9.52", ] [[package]] @@ -6014,7 +6023,7 @@ dependencies = [ "rand_chacha 0.3.1", "stats_alloc", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-riscv", ] @@ -6028,9 +6037,9 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -6042,10 +6051,10 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -6057,7 +6066,7 @@ dependencies = [ "pio", "pio-proc", "utralib 0.1.23", - "xous", + "xous 0.9.51", ] [[package]] @@ -6069,7 +6078,7 @@ dependencies = [ "pio", "pio-proc", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-pio", ] @@ -6098,11 +6107,11 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -6115,12 +6124,12 @@ dependencies = [ "num-traits", "rkyv", "utralib 0.1.23", - "xous", + "xous 0.9.51", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", "xous-semver", ] @@ -6134,9 +6143,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous", + "xous 0.9.51", "xous-api-names", - "xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.52", ] [[package]] @@ -6179,7 +6188,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] diff --git a/apps/app-loader/Cargo.toml b/apps/app-loader/Cargo.toml index d30dbd7b0..3a787cdf0 100644 --- a/apps/app-loader/Cargo.toml +++ b/apps/app-loader/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous = "0.9.40" -xous-ipc = "0.9.40" +xous = "0.9.52" +xous-ipc = "0.9.52" log-server = { package = "xous-api-log", version = "0.1.35" } log = "0.4.14" xous-names = { package = "xous-api-names", version = "0.9.37" }