From 763b03701cbdc24b6fbe7cfc7edb482765b29336 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Wed, 2 Oct 2024 15:44:20 +0200 Subject: [PATCH] update to new serialization API --- Cargo.lock | 59 +++++++++++++++++++++++---------------------------- src/client.rs | 2 +- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5283c72..5b6ae93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3136,12 +3136,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "unwrap-infallible" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" - [[package]] name = "unzip-n" version = "0.1.2" @@ -3543,7 +3537,7 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "ahash", "async-trait", @@ -3570,7 +3564,6 @@ dependencies = [ "tokio-util", "tracing", "uhlc 0.8.0", - "unwrap-infallible", "vec_map", "zenoh-buffers", "zenoh-codec", @@ -3625,7 +3618,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "zenoh-collections", ] @@ -3633,7 +3626,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "tracing", "uhlc 0.8.0", @@ -3644,12 +3637,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "json5", "num_cpus", @@ -3670,7 +3663,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "lazy_static", "tokio", @@ -3681,7 +3674,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "aes", "hmac", @@ -3694,7 +3687,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "hashbrown", "keyed-set", @@ -3708,7 +3701,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3725,7 +3718,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "flume", @@ -3748,7 +3741,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "base64 0.22.1", @@ -3773,7 +3766,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "socket2", @@ -3790,7 +3783,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "base64 0.22.1", @@ -3817,7 +3810,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "socket2", @@ -3836,7 +3829,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "nix", @@ -3854,7 +3847,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "futures-util", @@ -3874,7 +3867,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "proc-macro2", "quote", @@ -3885,7 +3878,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "git-version", "libloading", @@ -3901,7 +3894,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "const_format", "rand", @@ -3915,7 +3908,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "anyhow", ] @@ -3923,7 +3916,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "lazy_static", "ron", @@ -3936,7 +3929,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "event-listener", "futures", @@ -3949,7 +3942,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "futures", "tokio", @@ -3962,7 +3955,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "crossbeam-utils", @@ -3995,7 +3988,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "const_format", @@ -4020,7 +4013,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#09d1d1d353b5fdc620ae61a925bd530676d34382" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2" dependencies = [ "async-trait", "const_format", diff --git a/src/client.rs b/src/client.rs index 5848351..c20854e 100644 --- a/src/client.rs +++ b/src/client.rs @@ -127,7 +127,7 @@ impl S3Client { value: Value, metadata: Option>, ) -> ZResult { - let body = ByteStream::from(value.payload().into::>()); + let body = ByteStream::from(value.payload().to_bytes().to_vec()); Ok(self .client .put_object()