From bafb3e243698c97229c68cc91d8831185036abd6 Mon Sep 17 00:00:00 2001 From: Aru Sahni Date: Wed, 8 Feb 2023 09:11:57 -0500 Subject: [PATCH] Upgrade to Axum 0.6.4 Now that https://github.com/tokio-rs/axum/pull/1598 has been included in a release, we can resume tracking the official releases. --- Cargo.lock | 58 ++++++++++++++++++++--------------- Cargo.toml | 1 - deny.toml | 4 --- src/clusterd/Cargo.toml | 2 +- src/environmentd/Cargo.toml | 2 +- src/http-util/Cargo.toml | 2 +- src/mz/Cargo.toml | 2 +- src/persist-client/Cargo.toml | 2 +- src/prof/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 4 +-- 10 files changed, 41 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c5caf82764e..06dc32196c3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,7 +115,7 @@ source = "git+https://github.com/jorgecarleitao/arrow2.git#0ba4f8e21547ed08b4468 dependencies = [ "ahash", "arrow-format", - "base64", + "base64 0.13.1", "bytemuck", "chrono", "dyn-clone", @@ -701,12 +701,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" dependencies = [ "async-trait", "axum-core", - "base64", + "base64 0.20.0", "bitflags", "bytes", "futures-util", @@ -737,8 +738,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" dependencies = [ "async-trait", "bytes", @@ -789,6 +791,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64-simd" version = "0.7.0" @@ -2397,7 +2405,7 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "flate2", "nom", @@ -2410,7 +2418,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "headers-core", @@ -2744,7 +2752,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -2771,7 +2779,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "http", @@ -2801,7 +2809,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "dirs-next", @@ -3282,7 +3290,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" dependencies = [ - "base64", + "base64 0.13.1", "bigdecimal", "bindgen", "bitflags", @@ -3678,7 +3686,7 @@ dependencies = [ "assert_cmd", "async-trait", "axum", - "base64", + "base64 0.13.1", "bytes", "bytesize", "cc", @@ -3839,7 +3847,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "derivative", "jsonwebtoken", "mz-ore", @@ -4164,7 +4172,7 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-types", - "base64", + "base64 0.13.1", "bytes", "deadpool-postgres", "differential-dataflow", @@ -5486,7 +5494,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5669,7 +5677,7 @@ name = "postgres-protocol" version = "0.6.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "fallible-iterator", @@ -5954,7 +5962,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d378290cd658b119ce87621931ef448017ef1a0044d7b681159d779e7e07b8f6" dependencies = [ - "base64", + "base64 0.13.1", "prost", "prost-types", "serde", @@ -6200,7 +6208,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -6675,7 +6683,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "hex", "indexmap", @@ -7464,7 +7472,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7526,7 +7534,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "futures-core", @@ -7685,7 +7693,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -7797,7 +7805,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "base64", + "base64 0.13.1", "chunked_transfer", "log", "native-tls", @@ -8112,7 +8120,7 @@ dependencies = [ "aws-sigv4", "aws-smithy-http", "axum", - "base64", + "base64 0.13.1", "bstr", "byteorder", "bytes", diff --git a/Cargo.toml b/Cargo.toml index c6d69c9f4052..30d964ed4ffa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -109,7 +109,6 @@ debug = 1 # # The reasons for each of these overrides are listed in deny.toml. [patch.crates-io] -axum = { git = "https://github.com/tokio-rs/axum.git" } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x" } csv = { git = "https://github.com/BurntSushi/rust-csv.git" } csv-core = { git = "https://github.com/BurntSushi/rust-csv.git" } diff --git a/deny.toml b/deny.toml index 5616226866a9..d4f7953a9bd5 100644 --- a/deny.toml +++ b/deny.toml @@ -146,10 +146,6 @@ license-files = [ unknown-git = "deny" unknown-registry = "deny" allow-git = [ - # Waiting on https://github.com/tokio-rs/axum/pull/1598 to make it into a - # release. - "https://github.com/tokio-rs/axum.git", - # Waiting for a new release of strip-ansi-escapes that avoids the indirect # dependency on arrayvec v0.5.2 via a dependency on vte v0.10.1. "https://github.com/alacritty/vte", diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index 19be7e0326bb..01e77890d07d 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -axum = "0.6.1" +axum = "0.6.4" clap = { version = "3.2.20", features = ["derive", "env"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index c99ef6749eb7..a3001fcec834 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -12,7 +12,7 @@ publish = false anyhow = "1.0.66" askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] } async-trait = "0.1.59" -axum = { version = "0.6.1", features = ["headers", "ws"] } +axum = { version = "0.6.4", features = ["headers", "ws"] } base64 = "0.13.1" bytes = "1.3.0" bytesize = "1.1.0" diff --git a/src/http-util/Cargo.toml b/src/http-util/Cargo.toml index 47ae367ea81f..63c273dd131c 100644 --- a/src/http-util/Cargo.toml +++ b/src/http-util/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] } anyhow = "1.0.66" -axum = { version = "0.6.1", features = ["headers"] } +axum = { version = "0.6.4", features = ["headers"] } headers = "0.3.8" serde = "1.0.152" serde_json = { version = "1.0.89" } diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index 398325a17117..69a817bb1b3e 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" -axum = { version = "0.6.1" } +axum = { version = "0.6.4" } clap = { version = "3.2.20", features = [ "derive" ] } dirs = "4.0.0" indicatif = "0.17.2" diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index fe2328f80fb9..d478d32e5676 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -62,7 +62,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.59" -axum = { version = "0.6.1" } +axum = { version = "0.6.4" } clap = { version = "3.2.20", features = ["derive", "env"] } criterion = { version = "0.4.0", features = ["html_reports"] } datadriven = { version = "0.6.0", features = ["async"] } diff --git a/src/prof/Cargo.toml b/src/prof/Cargo.toml index d7fff45aefe0..29e4b9c778b0 100644 --- a/src/prof/Cargo.toml +++ b/src/prof/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] } anyhow = "1.0.66" -axum = { version = "0.6.1", features = ["headers"] } +axum = { version = "0.6.4", features = ["headers"] } backtrace = "0.3.66" bytesize = "1.1.0" cfg-if = "1.0.0" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index f991554b676d..47c5515e3c23 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -20,7 +20,7 @@ aws-sdk-sts = { version = "0.23.0", default-features = false, features = ["nativ aws-sig-auth = { version = "0.53.0", default-features = false, features = ["sign-eventstream"] } aws-sigv4 = { version = "0.53.0", features = ["sign-eventstream"] } aws-smithy-http = { version = "0.53.1", default-features = false, features = ["event-stream", "rt-tokio"] } -axum = { git = "https://github.com/tokio-rs/axum.git", features = ["headers", "ws"] } +axum = { version = "0.6.4", features = ["headers", "ws"] } base64 = { version = "0.13.1", features = ["alloc"] } bstr = { version = "0.2.14", features = ["serde1"] } byteorder = { version = "1.4.3" } @@ -117,7 +117,7 @@ aws-sdk-sts = { version = "0.23.0", default-features = false, features = ["nativ aws-sig-auth = { version = "0.53.0", default-features = false, features = ["sign-eventstream"] } aws-sigv4 = { version = "0.53.0", features = ["sign-eventstream"] } aws-smithy-http = { version = "0.53.1", default-features = false, features = ["event-stream", "rt-tokio"] } -axum = { git = "https://github.com/tokio-rs/axum.git", features = ["headers", "ws"] } +axum = { version="0.6.4", features = ["headers", "ws"] } base64 = { version = "0.13.1", features = ["alloc"] } bstr = { version = "0.2.14", features = ["serde1"] } byteorder = { version = "1.4.3" }