From 79afd0e8ea30ef4c54a879d33294796fec83b1e6 Mon Sep 17 00:00:00 2001 From: "Aode (Lion)" Date: Tue, 23 Nov 2021 12:29:42 -0600 Subject: [PATCH 1/2] Update deps --- Cargo.lock | 85 +++++++++++++++++++++-------------------------------- Cargo.toml | 4 ++- src/main.rs | 3 +- 3 files changed, 37 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e011f9c..40e04fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.12" +version = "3.0.0-beta.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afaeb3d3fcb06b775ac62f05d580aae4afe5a149513333a73f688fdf26c06639" +checksum = "1bc3f9d97e32d75fae3ad7d955ac005eea3fd3ea60a89132768700911a60fd94" dependencies = [ "actix-codec", "actix-rt", @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.11" +version = "4.0.0-beta.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85aa9bb018d83a0db70f557ba0cde9c6170a5d1de4fede02e377f68c1ac5aa9" +checksum = "e87cfc4efaad42f8a054e269d1b85046397ff4e8707e49128dea3f99a512a9d6" dependencies = [ "actix-codec", "actix-http", @@ -345,9 +345,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.10" +version = "3.0.0-beta.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f122bed94dc044b13a991b292ff6a3cde4c3fba890a4e3dbbec0f2eedc607f0a" +checksum = "f9f7d0c472987e454f41c3f4c7fa336ca139707ab255644b0480144c2060c800" dependencies = [ "actix-codec", "actix-http", @@ -379,8 +379,8 @@ dependencies = [ [[package]] name = "aws-creds" -version = "0.26.2" -source = "git+https://github.com/asonix/rust-s3?branch=asonix/main#d3c853b7401ee72d77a764e0b8c639eb721b304c" +version = "0.27.1" +source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#ca6296ac13e9508c68dd5a79d1de64cf39f403b7" dependencies = [ "anyhow", "dirs", @@ -521,9 +521,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "3825b1e8580894917dc4468cb634a1b4e9745fddc854edad72d9c04644c0319f" dependencies = [ "cfg-if", ] @@ -687,9 +687,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" dependencies = [ "futures-channel", "futures-core", @@ -702,9 +702,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" dependencies = [ "futures-core", "futures-sink", @@ -712,15 +712,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" dependencies = [ "futures-core", "futures-task", @@ -729,18 +729,16 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" dependencies = [ - "autocfg", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -748,23 +746,22 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" dependencies = [ - "autocfg", "futures-channel", "futures-core", "futures-io", @@ -774,8 +771,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1466,18 +1461,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" version = "1.0.32" @@ -1719,8 +1702,8 @@ dependencies = [ [[package]] name = "rust-s3" -version = "0.27.0" -source = "git+https://github.com/asonix/rust-s3?branch=asonix/main#d3c853b7401ee72d77a764e0b8c639eb721b304c" +version = "0.28.0" +source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#ca6296ac13e9508c68dd5a79d1de64cf39f403b7" dependencies = [ "anyhow", "async-trait", @@ -2349,9 +2332,8 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.5.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cac34827e06f78b69523b2fbe5b2dd4dfc75940b2ea5ba37e4fa2a25d4a0edf" +version = "0.5.0-beta.3" +source = "git+https://github.com/caizixian/tracing-actix-web#aafa35384335592718d8e7cf458a7de231d82843" dependencies = [ "actix-web", "opentelemetry", @@ -2376,8 +2358,7 @@ dependencies = [ [[package]] name = "tracing-awc" version = "0.1.0-beta.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd4b847e7dda81d94259935b8abcb7ddc7946ae99f11e4e6496cd32c237a304" +source = "git+https://git.asonix.dog/asonix/tracing-awc#33aa802572c5b260835ae21f2df7f6528dfd07c5" dependencies = [ "actix-http", "awc", diff --git a/Cargo.toml b/Cargo.toml index b60dd27..71036fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ opentelemetry = { version = "0.16", features = ["rt-tokio"] } opentelemetry-otlp = "0.9" pin-project-lite = "0.2.7" reqwest = { version = "0.11.5", default-features = false, features = ["rustls-tls", "stream"], optional = true } -rust-s3 = { version = "0.27.0", default-features = false, features = ["fail-on-err", "with-reqwest"], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/main" } +rust-s3 = { version = "0.28.0", default-features = false, features = ["fail-on-err", "with-reqwest"], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/generic-client" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sha2 = "0.9.0" @@ -58,8 +58,10 @@ uuid = { version = "0.8.2", features = ["v4", "serde"] } version = "0.5.0-alpha.2" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] +git = "https://github.com/caizixian/tracing-actix-web" [dependencies.tracing-awc] version = "0.1.0-beta.8" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] +git = "https://git.asonix.dog/asonix/tracing-awc" diff --git a/src/main.rs b/src/main.rs index 604ca04..79c3a51 100644 --- a/src/main.rs +++ b/src/main.rs @@ -599,8 +599,7 @@ where ])) .insert_header((ACCEPT_RANGES, "bytes")) .content_type(ext.to_string()) - // TODO: remove pin when actix-web drops Unpin requirement - .streaming(Box::pin(stream)) + .streaming(stream) } #[derive(Debug, serde::Deserialize)] From d9298988ac32be6f00c87e5ce7b1f33f40bbc4f8 Mon Sep 17 00:00:00 2001 From: "Aode (Lion)" Date: Tue, 23 Nov 2021 12:32:00 -0600 Subject: [PATCH 2/2] Fix tracing-actix-web version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 71036fe..2660f61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ url = { version = "2.2", features = ["serde"] } uuid = { version = "0.8.2", features = ["v4", "serde"] } [dependencies.tracing-actix-web] -version = "0.5.0-alpha.2" +version = "0.5.0-beta.2" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] git = "https://github.com/caizixian/tracing-actix-web"