From 8edbcd03d3a6f39af30e3885d2410a98f696e759 Mon Sep 17 00:00:00 2001 From: Park Joon-Kyu Date: Wed, 6 Nov 2024 22:05:45 +0900 Subject: [PATCH] revert autoformatting --- actix-http/CHANGES.md | 1 + actix-http/Cargo.toml | 29 +++++++++++++++-------------- awc/Cargo.toml | 22 ++++++---------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 982add26a..3d924a241 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -5,6 +5,7 @@ ### Added - Add `header::CLEAR_SITE_DATA` constant. +- Add DEFLATE compression support for WebSocket. ### Changed diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index e94c6745e..704f06c1e 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "actix-http" version = "3.9.0" -authors = ["Nikolay Kim ", "Rob Ede "] +authors = [ + "Nikolay Kim ", + "Rob Ede ", +] description = "HTTP types and services for the Actix ecosystem" keywords = ["actix", "http", "framework", "async", "futures"] homepage = "https://actix.rs" @@ -60,7 +63,12 @@ default = [] http2 = ["dep:h2"] # WebSocket protocol implementation -ws = ["dep:local-channel", "dep:base64", "dep:rand", "dep:sha1"] +ws = [ + "dep:local-channel", + "dep:base64", + "dep:rand", + "dep:sha1", +] # TLS via OpenSSL openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"] @@ -82,8 +90,8 @@ rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"] # Compression codecs compress-brotli = ["__compress", "dep:brotli"] -compress-gzip = ["__compress", "dep:flate2"] -compress-zstd = ["__compress", "dep:zstd"] +compress-gzip = ["__compress", "dep:flate2"] +compress-zstd = ["__compress", "dep:zstd"] compress-ws-deflate = ["dep:flate2", "flate2/zlib-default"] # Internal (PRIVATE!) features used to aid testing and checking feature status. @@ -106,9 +114,7 @@ bytes = "1" bytestring = "1" derive_more = { version = "1", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] } encoding_rs = "0.8" -futures-core = { version = "0.3.17", default-features = false, features = [ - "alloc", -] } +futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] } http = "0.2.7" httparse = "1.5.1" httpdate = "1.0.1" @@ -142,19 +148,14 @@ zstd = { version = "0.13", optional = true } [dev-dependencies] actix-http-test = { version = "3", features = ["openssl"] } actix-server = "2" -actix-tls = { version = "3.4", features = [ - "openssl", - "rustls-0_23-webpki-roots", -] } +actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] } actix-web = "4" async-stream = "0.3" criterion = { version = "0.5", features = ["html_reports"] } divan = "0.1.8" env_logger = "0.11" -futures-util = { version = "0.3.17", default-features = false, features = [ - "alloc", -] } +futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] } memchr = "2.4" once_cell = "1.9" rcgen = "0.13" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 95db5e761..4ef3c5239 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -63,15 +63,9 @@ rustls-0_20 = ["tls-rustls-0_20", "actix-tls/rustls-0_20"] # TLS via Rustls v0.21 rustls-0_21 = ["tls-rustls-0_21", "actix-tls/rustls-0_21"] # TLS via Rustls v0.22 (WebPKI roots) -rustls-0_22-webpki-roots = [ - "tls-rustls-0_22", - "actix-tls/rustls-0_22-webpki-roots", -] +rustls-0_22-webpki-roots = ["tls-rustls-0_22", "actix-tls/rustls-0_22-webpki-roots"] # TLS via Rustls v0.22 (Native roots) -rustls-0_22-native-roots = [ - "tls-rustls-0_22", - "actix-tls/rustls-0_22-native-roots", -] +rustls-0_22-native-roots = ["tls-rustls-0_22", "actix-tls/rustls-0_22-native-roots"] # TLS via Rustls v0.23 rustls-0_23 = ["tls-rustls-0_23", "actix-tls/rustls-0_23"] # TLS via Rustls v0.23 (WebPKI roots) @@ -120,7 +114,7 @@ futures-util = { version = "0.3.17", default-features = false, features = ["allo h2 = "0.3.26" http = "0.2.7" itoa = "1" -log = " 0.4" +log = "0.4" mime = "0.3" percent-encoding = "2.1" pin-project-lite = "0.2" @@ -133,12 +127,8 @@ tokio = { version = "1.24.2", features = ["sync"] } cookie = { version = "0.16", features = ["percent-encode"], optional = true } tls-openssl = { package = "openssl", version = "0.10.55", optional = true } -tls-rustls-0_20 = { package = "rustls", version = "0.20", optional = true, features = [ - "dangerous_configuration", -] } -tls-rustls-0_21 = { package = "rustls", version = "0.21", optional = true, features = [ - "dangerous_configuration", -] } +tls-rustls-0_20 = { package = "rustls", version = "0.20", optional = true, features = ["dangerous_configuration"] } +tls-rustls-0_21 = { package = "rustls", version = "0.21", optional = true, features = ["dangerous_configuration"] } tls-rustls-0_22 = { package = "rustls", version = "0.22", optional = true } tls-rustls-0_23 = { package = "rustls", version = "0.23", optional = true, default-features = false } @@ -163,7 +153,7 @@ rcgen = "0.13" rustls-pemfile = "2" tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] } zstd = "0.13" -tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests +tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests [lints] workspace = true