From d6eeab3b3c2be5d2950d97d1843a86bed553312b Mon Sep 17 00:00:00 2001 From: xfy Date: Tue, 24 Sep 2024 09:12:14 +0800 Subject: [PATCH] feat(axum): use rust nightly --- web/Rust/axum/.cargo/config.toml | 2 ++ web/Rust/axum/Cargo.lock | 43 ++++++++++++++++++------------- web/Rust/axum/Cargo.toml | 11 +++----- web/Rust/axum/rust-toolchain.toml | 2 ++ 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 web/Rust/axum/.cargo/config.toml create mode 100644 web/Rust/axum/rust-toolchain.toml diff --git a/web/Rust/axum/.cargo/config.toml b/web/Rust/axum/.cargo/config.toml new file mode 100644 index 0000000..c32d7b2 --- /dev/null +++ b/web/Rust/axum/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.x86_64-unknown-linux-gnu] +rustflags = ["-C", "target-cpu=native", "-Z", "threads=8"] diff --git a/web/Rust/axum/Cargo.lock b/web/Rust/axum/Cargo.lock index aaec850..1523eda 100644 --- a/web/Rust/axum/Cargo.lock +++ b/web/Rust/axum/Cargo.lock @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "async-compression" @@ -82,9 +82,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec" dependencies = [ "async-trait", "axum-core", @@ -108,7 +108,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", @@ -129,7 +129,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -393,6 +393,8 @@ dependencies = [ "hyper", "pin-project-lite", "tokio", + "tower 0.4.13", + "tower-service", ] [[package]] @@ -856,18 +858,18 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -939,7 +941,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -948,15 +949,21 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ "async-compression", "base64", @@ -976,7 +983,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", diff --git a/web/Rust/axum/Cargo.toml b/web/Rust/axum/Cargo.toml index 3ad6036..c1bdfd5 100644 --- a/web/Rust/axum/Cargo.toml +++ b/web/Rust/axum/Cargo.toml @@ -3,20 +3,17 @@ name = "phthonus" version = "0.1.0" edition = "2021" -[build] -rustflags = ["-C", "target-cpu=native"] - [dependencies] # server -axum = "0.7.5" +axum = "0.7.6" tokio = { version = "1.40.0", features = ["full"] } tower = "0.5.1" -tower-http = { version = "0.5.2", features = ["full"] } +tower-http = { version = "0.6.1", features = ["full"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } # error -anyhow = "1.0.88" -thiserror = "1.0.63" +anyhow = "1.0.89" +thiserror = "1.0.64" # tools dotenvy = "0.15.7" serde = { version = "1.0.210", features = ["derive", "serde_derive"] } diff --git a/web/Rust/axum/rust-toolchain.toml b/web/Rust/axum/rust-toolchain.toml new file mode 100644 index 0000000..5d56faf --- /dev/null +++ b/web/Rust/axum/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly"