Skip to content

[pull] main from tower-rs:main #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barjin merged 3 commits into from
Apr 13, 2026
Merged

[pull] main from tower-rs:main #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6d5499
examples: Remove unnecessary trait bound (#651)
tottoto Mar 30, 2026
0398338
Remove implicit async-compression feature (#642)
tottoto Mar 31, 2026
0d608fd
Fix clippy warnings (#659)
alexanderkjall Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions examples/tonic-key-value-store/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,10 @@ async fn make_client(
) -> Result<
KeyValueStoreClient<
impl Service<
http::Request<Body>,
Response = http::Response<impl HttpBody<Data = Bytes, Error = impl Into<BoxError>>>,
Error = impl Into<BoxError>,
> + Clone
+ Send
+ Sync
+ 'static,
http::Request<Body>,
Response = http::Response<impl HttpBody<Data = Bytes, Error = impl Into<BoxError>>>,
Error = impl Into<BoxError>,
>,
>,
tonic::transport::Error,
> {
Expand Down
6 changes: 6 additions & 0 deletions tower-http/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

# Unreleased

## Changed:

- The implicit `async-compression` feature is removed (BREAKING) ([#642])

[#642]: https://github.com/tower-rs/tower-http/pull/642

# 0.6.8

## Fixed
Expand Down
16 changes: 8 additions & 8 deletions tower-http/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@ trace = ["dep:http-body", "tracing"]
util = ["tower"]
validate-request = ["mime"]

compression-br = ["async-compression/brotli", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-deflate = ["async-compression/zlib", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-br = ["dep:async-compression", "async-compression?/brotli", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-deflate = ["dep:async-compression", "async-compression?/zlib", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-full = ["compression-br", "compression-deflate", "compression-gzip", "compression-zstd"]
compression-gzip = ["async-compression/gzip", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-zstd = ["async-compression/zstd", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-gzip = ["dep:async-compression", "async-compression?/gzip", "futures-core", "dep:http-body", "tokio-util", "tokio"]
compression-zstd = ["dep:async-compression", "async-compression?/zstd", "futures-core", "dep:http-body", "tokio-util", "tokio"]

decompression-br = ["async-compression/brotli", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-deflate = ["async-compression/zlib", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-br = ["dep:async-compression", "async-compression?/brotli", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-deflate = ["dep:async-compression", "async-compression?/zlib", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-full = ["decompression-br", "decompression-deflate", "decompression-gzip", "decompression-zstd"]
decompression-gzip = ["async-compression/gzip", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-zstd = ["async-compression/zstd", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-gzip = ["dep:async-compression", "async-compression?/gzip", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]
decompression-zstd = ["dep:async-compression", "async-compression?/zstd", "futures-core", "dep:http-body", "dep:http-body-util", "tokio-util", "tokio"]

[package.metadata.docs.rs]
all-features = true
Expand Down
9 changes: 2 additions & 7 deletions tower-http/src/cors/allow_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,12 @@ impl fmt::Debug for AllowCredentials {
}
}

#[derive(Clone)]
#[derive(Clone, Default)]
enum AllowCredentialsInner {
Yes,
#[default]
No,
Predicate(
Arc<dyn for<'a> Fn(&'a HeaderValue, &'a RequestParts) -> bool + Send + Sync + 'static>,
),
}

impl Default for AllowCredentialsInner {
fn default() -> Self {
Self::No
}
}
9 changes: 2 additions & 7 deletions tower-http/src/cors/allow_private_network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,16 @@ impl fmt::Debug for AllowPrivateNetwork {
}
}

#[derive(Clone)]
#[derive(Clone, Default)]
enum AllowPrivateNetworkInner {
Yes,
#[default]
No,
Predicate(
Arc<dyn for<'a> Fn(&'a HeaderValue, &'a RequestParts) -> bool + Send + Sync + 'static>,
),
}

impl Default for AllowPrivateNetworkInner {
fn default() -> Self {
Self::No
}
}

#[cfg(test)]
mod tests {
#![allow(
Expand Down
3 changes: 1 addition & 2 deletions tower-http/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
clippy::all,
clippy::dbg_macro,
clippy::todo,
clippy::empty_enum,
clippy::empty_enums,
clippy::enum_glob_use,
clippy::mem_forget,
clippy::unused_self,
Expand All @@ -173,7 +173,6 @@
clippy::match_wildcard_for_single_variants,
clippy::if_let_mutex,
clippy::await_holding_lock,
clippy::match_on_vec_items,
clippy::imprecise_flops,
clippy::suboptimal_flops,
clippy::lossy_float_literal,
Expand Down
Loading