Skip to content

Commit

Permalink
chore(deps): hyper-util v0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fundon committed May 25, 2024
1 parent 6431455 commit 3a75e4d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ headers = "0.4"
http = "1.1"
http-body = "1"
http-body-util = "0.1"
hyper = { version = "1.3", features = ["server"] }
hyper-util = { version = "0.1.3", features = ["server-auto", "tokio"] }
hyper = { version = "1.3" }
hyper-util = { version = "0.1.4", features = ["tokio", "server"] }
mime = "0.3"
mime_guess = "2.0"
percent-encoding = "2.3"
Expand Down Expand Up @@ -118,7 +118,7 @@ tower = "0.4"
tower-http = "0.5"

# Soml
async-channel = "2.2"
async-channel = "2.3"
async-executor = "1.11"
async-io = "2.3"
async-net = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/otel/tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ viz = { workspace = true, features = ["otel-tracing"] }

tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
opentelemetry.workspace = true
opentelemetry-otlp = { version = "0.15", default-features = false, features = ["trace", "http-proto"] }
opentelemetry_sdk = { workspace = true, features = ["trace", "rt-tokio-current-thread"] }
opentelemetry-otlp = { version = "0.16", default-features = false, features = ["trace", "http-proto"] }
9 changes: 5 additions & 4 deletions viz-smol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ session = ["cookie", "cookie-private", "viz-core/session"]
csrf = ["cookie", "cookie-private", "viz-core/csrf"]
cors = ["viz-core/cors"]

http1 = ["hyper/http1"]
http2 = ["hyper/http2"]
http1 = ["dep:hyper", "hyper?/http1", "hyper-util?/http1"]
http2 = ["dep:hyper", "hyper?/http2", "hyper-util?/http2"]

unix-socket = []

Expand All @@ -64,8 +64,9 @@ viz-router.workspace = true
viz-handlers = { workspace = true, optional = true }
viz-macros = { workspace = true, optional = true }

hyper.workspace = true
hyper-util.workspace = true
hyper = { workspace = true, optional = true }
hyper-util = { workspace = true, optional = true }

tracing.workspace = true

async-executor.workspace = true
Expand Down
1 change: 1 addition & 0 deletions viz-smol/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::{borrow::Borrow, fmt::Debug, io, sync::Arc};
use async_executor::Executor;
use futures_lite::io::{AsyncRead, AsyncWrite};
use hyper::rt::Timer;
#[cfg(any(feature = "http1", feature = "http2"))]
use hyper_util::server::conn::auto::Builder;
use smol_hyper::rt::{FuturesIo, SmolExecutor, SmolTimer};

Expand Down
8 changes: 4 additions & 4 deletions viz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cors = ["viz-core/cors"]

compression = ["viz-core/compression"]

http1 = ["hyper/http1", "hyper-util/http1"]
http2 = ["hyper/http2", "hyper-util/http2"]
http1 = ["dep:hyper", "dep:hyper-util", "hyper?/http1", "hyper-util?/http1"]
http2 = ["dep:hyper", "dep:hyper-util", "hyper?/http2", "hyper-util?/http2"]

unix-socket = []

Expand All @@ -76,8 +76,8 @@ viz-router.workspace = true
viz-handlers = { workspace = true, optional = true }
viz-macros = { workspace = true, optional = true }

hyper.workspace = true
hyper-util.workspace = true
hyper = { workspace = true, optional = true }
hyper-util = { workspace = true, optional = true }

futures-util = { workspace = true, optional = true }
tracing.workspace = true
Expand Down
1 change: 1 addition & 0 deletions viz/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::{
};

use hyper_util::rt::{TokioExecutor, TokioIo};
#[cfg(any(feature = "http1", feature = "http2"))]
use hyper_util::server::conn::auto::Builder;
use tokio::{
io::{AsyncRead, AsyncWrite},
Expand Down

0 comments on commit 3a75e4d

Please sign in to comment.