From d844b24c1ad5a874f85b097304de997d971d5b5c Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 8 Oct 2021 16:47:48 +0200 Subject: [PATCH] Updates --- .../etc_syndicate/configdirs.pr | 4 +- synit-pid1/Cargo.lock | 72 +++++++++---------- synit-pid1/Cargo.toml | 4 +- synit-pid1/Makefile | 5 ++ synit-pid1/src/main.rs | 11 +-- 5 files changed, 51 insertions(+), 45 deletions(-) diff --git a/experiments/alpine-standalone/etc_syndicate/configdirs.pr b/experiments/alpine-standalone/etc_syndicate/configdirs.pr index 90f19b7..6a385fa 100644 --- a/experiments/alpine-standalone/etc_syndicate/configdirs.pr +++ b/experiments/alpine-standalone/etc_syndicate/configdirs.pr @@ -1,2 +1,2 @@ -> -> +> +> diff --git a/synit-pid1/Cargo.lock b/synit-pid1/Cargo.lock index b813b4d..670188e 100644 --- a/synit-pid1/Cargo.lock +++ b/synit-pid1/Cargo.lock @@ -75,9 +75,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cc" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -380,9 +380,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "lock_api" @@ -450,9 +450,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031" +checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba" dependencies = [ "bitflags", "cc", @@ -707,9 +707,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -792,9 +792,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -803,9 +803,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if", @@ -840,9 +840,9 @@ checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "strsim" @@ -888,9 +888,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.76" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "syndicate" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bytes", "futures", @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "syndicate-macros" -version = "0.7.0" +version = "0.8.0" dependencies = [ "proc-macro2", "quote", @@ -969,18 +969,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec" +checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71" +checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2", "quote", @@ -998,9 +998,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg", "bytes", @@ -1017,9 +1017,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +checksum = "154794c8f499c2619acd19e839294703e9e32e7630ef5f46ea80d4ef0fbee5eb" dependencies = [ "proc-macro2", "quote", @@ -1042,9 +1042,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if", "pin-project-lite", @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ "proc-macro2", "quote", @@ -1065,9 +1065,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] @@ -1105,9 +1105,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.20" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -1139,9 +1139,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" diff --git a/synit-pid1/Cargo.toml b/synit-pid1/Cargo.toml index c49531c..8e6fba1 100644 --- a/synit-pid1/Cargo.toml +++ b/synit-pid1/Cargo.toml @@ -25,8 +25,8 @@ syndicate = { path = "localdev/syndicate-rs/syndicate" } syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" } [dependencies] -syndicate = "0.12.0" -syndicate-macros = "0.7.0" +syndicate = "0.13" +syndicate-macros = "0.8" clap = "3.0.0-beta.2" clap_generate = "3.0.0-beta.2" diff --git a/synit-pid1/Makefile b/synit-pid1/Makefile index 429abb8..47bff74 100644 --- a/synit-pid1/Makefile +++ b/synit-pid1/Makefile @@ -1,6 +1,11 @@ all: cargo build --all-targets +arm-binary: arm-binary-release + +arm-binary-release: + cross build --target=armv7-unknown-linux-musleabihf --release --all-targets + aarch64-binary: aarch64-binary-release aarch64-binary-release: diff --git a/synit-pid1/src/main.rs b/synit-pid1/src/main.rs index 8cdc427..eeb6f5d 100644 --- a/synit-pid1/src/main.rs +++ b/synit-pid1/src/main.rs @@ -113,13 +113,14 @@ async fn main() -> Result<(), Box> { let from_server = server.stdout.expect("Missing dataspace server stdout"); let to_server = server.stdin.expect("Missing dataspace server stdin"); let ds = &relay::TunnelRelay::run(t, - relay::Input::Bytes(Box::pin(from_server)), - relay::Output::Bytes(Box::pin(to_server)), - None, - Some(sturdy::Oid(0.into()))) + relay::Input::Bytes(Box::pin(from_server)), + relay::Output::Bytes(Box::pin(to_server)), + None, + Some(sturdy::Oid(0.into())), + false) .expect("Missing reference to dataspace") .underlying; - t.assert(ds, Value::simple_record1("pid1", AnyValue::domain(Cap::new(&listener))).wrap()); + t.assert(ds, Value::simple_record1("init", AnyValue::domain(Cap::new(&listener))).wrap()); Ok(()) });