Skip to content

Commit

Permalink
feat: bump to axum 0.7 (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
chris13524 authored Apr 15, 2024
1 parent 4b5efc2 commit dfb9d59
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ profiler = ["alloc/profiler"]
rate_limit = ["dep:rate_limit"]

[workspace.dependencies]
aws-sdk-s3 = "1.13"
aws-sdk-s3 = "1.21.0"

[dependencies]
alloc = { path = "./crates/alloc", optional = true }
Expand All @@ -53,9 +53,9 @@ rate_limit = { path = "./crates/rate_limit", optional = true }
anyhow = "1"
structopt = { version = "0.3", default-features = false }
tokio = { version = "1", features = ["full"] }
hyper = { version = "0.14", features = ["full"] }
hyper = { version = "1.2.0", features = ["full"] }
tower = { version = "0.4", features = ["util", "filter"] }
axum = "0.6.1"
axum = "0.7.5"

[[example]]
name = "alloc_profiler"
Expand Down
8 changes: 4 additions & 4 deletions crates/geoip/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ middleware = ["dep:tower", "dep:tower-layer", "dep:axum-client-ip", "dep:http-bo
[dependencies]
tower = { version = "0.4", optional = true }
tower-layer = { version = "0.3", optional = true }
http-body = { version = "0.4", optional = true }
axum-client-ip = { version = "0.4", optional = true }
http-body = { version = "1.0.0", optional = true }
axum-client-ip = { version = "0.5.1", optional = true }
bitflags = "2.4"
hyper = "0.14"
hyper = "1.2.0"
tracing = "0.1"
thiserror = "1.0"
futures = "0.3"
Expand All @@ -24,4 +24,4 @@ maxminddb = "0.23"

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
axum = "0.6"
axum = "0.7.5"
3 changes: 2 additions & 1 deletion crates/geoip/src/block/middleware/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use {
block::{middleware::GeoBlockLayer, BlockingPolicy},
LocalResolver,
},
hyper::{Body, Request, Response, StatusCode},
axum::body::Body,
hyper::{Request, Response, StatusCode},
maxminddb::{geoip2, geoip2::City},
std::{convert::Infallible, net::IpAddr, sync::Arc},
tower::{Service, ServiceBuilder, ServiceExt},
Expand Down
2 changes: 1 addition & 1 deletion crates/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ metrics = ["dep:metrics", "dep:future"]
[dependencies]
future = { path = "../future", features = ["metrics"], optional = true }
metrics = { path = "../metrics", optional = true }
hyper = "0.14"
hyper = "1.2.0"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "time", "macros"] }
3 changes: 2 additions & 1 deletion examples/geoblock.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use {
hyper::{Body, Request, Response, StatusCode},
axum::body::Body,
hyper::{Request, Response, StatusCode},
std::{convert::Infallible, net::IpAddr},
tower::{Service, ServiceBuilder, ServiceExt},
wc::geoip::{
Expand Down

0 comments on commit dfb9d59

Please sign in to comment.