Skip to content

Commit 44d9ee3

Browse files
authored
chore: fix minimal-versions correctness (tokio-rs#2231)
## Motivation Fix minimal-versions failure. ## Solution Upgrade all the dependencies to their most recent semver-compatible version, adjusting back down as necessary for MSRV. ## Context [cargo-minimal-versions](https://lib.rs/crates/cargo-minimal-versions) is wonderful. With this PR, the full repo passes under all of - `cargo hack --workspace minimal-versions check --all-features` - `cargo +1.49 hack --workspace --exclude tracing-appender minimal-versions check --all-features` - `cargo +1.53 hack -p tracing-appender minimal-versions check --all-features` - All of CI 😇
1 parent 7ecaedf commit 44d9ee3

File tree

15 files changed

+95
-85
lines changed

15 files changed

+95
-85
lines changed

examples/Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@ tracing-appender = { path = "../tracing-appender" }
2626
tracing-journald = { path = "../tracing-journald" }
2727

2828
# serde example
29-
serde_json = "1.0"
29+
serde_json = "1.0.82"
3030

31-
futures = "0.3"
32-
tokio = { version = "1.1", features = ["full"] }
31+
futures = "0.3.21"
32+
tokio = { version = "1.20.0", features = ["full"] }
3333

3434
# env-logger example
35-
env_logger = "0.8"
35+
env_logger = "0.8.4"
3636

3737
# tower examples
38-
tower = { version = "0.4.4", features = ["full"] }
39-
http = "0.2"
40-
hyper = { version = "0.14.11", features = ["full"] }
41-
rand = "0.7"
42-
bytes = "1"
43-
argh = "0.1.5"
38+
tower = { version = "0.4.13", features = ["full"] }
39+
http = "0.2.8"
40+
hyper = { version = "0.14.20", features = ["full"] }
41+
rand = "0.7.3"
42+
bytes = "1.2.0"
43+
argh = "0.1.8"
4444

4545
# sloggish example
46-
ansi_term = "0.12"
47-
humantime = "2.0"
48-
log = "0.4"
46+
ansi_term = "0.12.1"
47+
humantime = "2.1.0"
48+
log = "0.4.17"
4949

5050
# inferno example
51-
inferno = "0.11.0"
52-
tempfile = "3"
51+
inferno = "0.11.6"
52+
tempfile = "3.3.0"
5353

5454
# opentelemetry example
55-
opentelemetry = { version = "0.17", default-features = false, features = ["trace"] }
56-
opentelemetry-jaeger = "0.16"
55+
opentelemetry = { version = "0.17.0", default-features = false, features = ["trace"] }
56+
opentelemetry-jaeger = "0.16.0"
5757

5858
# fmt examples
5959
snafu = "0.6.10"
60-
thiserror = "1.0.26"
60+
thiserror = "1.0.31"

tracing-appender/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ edition = "2018"
2121
rust-version = "1.53.0"
2222

2323
[dependencies]
24-
crossbeam-channel = "0.5.0"
25-
time = { version = "0.3", default-features = false, features = ["formatting"] }
26-
parking_lot = { optional = true, version = "0.12.0" }
27-
thiserror = "1"
24+
crossbeam-channel = "0.5.5"
25+
time = { version = "0.3.2", default-features = false, features = ["formatting"] }
26+
parking_lot = { optional = true, version = "0.12.1" }
27+
thiserror = "1.0.31"
2828

2929
[dependencies.tracing-subscriber]
3030
path = "../tracing-subscriber"
@@ -33,11 +33,11 @@ default-features = false
3333
features = ["fmt", "std"]
3434

3535
[dev-dependencies]
36-
criterion = { version = "0.3", default_features = false }
36+
criterion = { version = "0.3.6", default_features = false }
3737
tracing = { path = "../tracing", version = "0.2" }
38-
time = { version = "0.3", default-features = false, features = ["formatting", "parsing"] }
39-
tempfile = "3"
38+
time = { version = "0.3.2", default-features = false, features = ["formatting", "parsing"] }
39+
tempfile = "3.3.0"
4040

4141
[[bench]]
4242
name = "bench"
43-
harness = false
43+
harness = false

tracing-attributes/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ rust-version = "1.49.0"
3434
proc-macro = true
3535

3636
[dependencies]
37-
proc-macro2 = "1"
38-
syn = { version = "1.0.43", default-features = false, features = ["full", "parsing", "printing", "visit", "visit-mut", "clone-impls", "extra-traits", "proc-macro"] }
39-
quote = "1"
37+
proc-macro2 = "1.0.40"
38+
syn = { version = "1.0.98", default-features = false, features = ["full", "parsing", "printing", "visit", "visit-mut", "clone-impls", "extra-traits", "proc-macro"] }
39+
quote = "1.0.20"
4040

4141
[dev-dependencies]
4242
tracing = { path = "../tracing", version = "0.2" }
4343
tracing-mock = { path = "../tracing-mock", features = ["tokio-test"] }
44-
tokio-test = { version = "0.3.0" }
44+
tokio-test = "0.4.2"
4545
tracing-core = { path = "../tracing-core", version = "0.2"}
4646
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = ["env-filter"] }
47-
async-trait = "0.1.44"
47+
async-trait = "0.1.56"
4848

4949
[badges]
5050
maintenance = { status = "experimental" }

tracing-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ std = ["once_cell", "alloc"]
3535
maintenance = { status = "actively-developed" }
3636

3737
[dependencies]
38-
once_cell = { version = "1.12", optional = true }
38+
once_cell = { version = "1.13.0", optional = true }
3939

4040
[package.metadata.docs.rs]
4141
all-features = true

tracing-flame/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ smallvec = ["tracing-subscriber/smallvec"]
2828
[dependencies]
2929
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry", "fmt"] }
3030
tracing = { path = "../tracing", version = "0.2", default-features = false, features = ["std"] }
31-
once_cell = "1.12"
31+
once_cell = "1.13.0"
3232

3333
[dev-dependencies]
34-
tempfile = "3"
34+
tempfile = "3.3.0"

tracing-futures/Cargo.toml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,20 @@ tokio = ["tokio_01"]
2727
std = ["tracing/std"]
2828

2929
[dependencies]
30-
futures_01 = { package = "futures", version = "0.1", optional = true }
31-
futures = { version = "0.3.0", optional = true }
32-
futures-task = { version = "0.3", optional = true }
33-
pin-project-lite = { version = "0.2.4", optional = true }
30+
futures_01 = { package = "futures", version = "0.1.31", optional = true }
31+
futures = { version = "0.3.21", optional = true }
32+
futures-task = { version = "0.3.21", optional = true }
33+
pin-project-lite = { version = "0.2.9", optional = true }
3434
tracing = { path = "../tracing", version = "0.2", default-features = false }
35-
tokio-executor = { version = "0.1", optional = true }
36-
tokio_01 = { package = "tokio", version = "0.1", optional = true }
35+
tokio-executor = { version = "0.1.10", optional = true }
36+
tokio_01 = { package = "tokio", version = "0.1.22", optional = true }
37+
38+
# Fix minimal-versions
39+
tokio-threadpool = "0.1.18"
40+
mio = "0.6.23"
3741

3842
[dev-dependencies]
39-
tokio-test = "0.4"
43+
tokio-test = "0.4.2"
4044
tracing-core = { path = "../tracing-core", version = "0.2" }
4145
tracing-mock = { path = "../tracing-mock", features = ["tokio-test"] }
4246

tracing-journald/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ keywords = ["tracing", "journald"]
1616
rust-version = "1.49.0"
1717

1818
[dependencies]
19-
libc = "0.2.107"
19+
libc = "0.2.126"
2020
tracing-core = { path = "../tracing-core", version = "0.2" }
2121
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry"] }
2222

2323
[dev-dependencies]
24-
serde_json = "1.0.68"
25-
serde = { version = "1.0.130", features = ["derive"] }
24+
serde_json = "1.0.82"
25+
serde = { version = "1.0.139", features = ["derive"] }
2626
tracing = { path = "../tracing", version = "0.2" }
2727

tracing-journald/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl Subscriber {
158158
#[cfg(not(unix))]
159159
fn send_payload(&self, _opayload: &[u8]) -> io::Result<()> {
160160
Err(io::Error::new(
161-
io::ErrorKind::Unsupported,
161+
io::ErrorKind::Other,
162162
"journald not supported on non-Unix",
163163
))
164164
}
@@ -179,7 +179,7 @@ impl Subscriber {
179179
#[cfg(all(unix, not(target_os = "linux")))]
180180
fn send_large_payload(&self, _payload: &[u8]) -> io::Result<usize> {
181181
Err(io::Error::new(
182-
io::ErrorKind::Unsupported,
182+
io::ErrorKind::Other,
183183
"Large payloads not supported on non-Linux OS",
184184
))
185185
}

tracing-log/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ log-tracer = []
2424

2525
[dependencies]
2626
tracing-core = { path = "../tracing-core", version = "0.2"}
27-
log = { version = "0.4" }
28-
once_cell = "1.12"
29-
env_logger = { version = "0.8", optional = true }
27+
log = "0.4.17"
28+
once_cell = "1.13.0"
29+
env_logger = { version = "0.8.4", optional = true }
3030

3131
[dev-dependencies]
3232
tracing = { path = "../tracing", version = "0.2"}

tracing-mock/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ publish = false
2020
[dependencies]
2121
tracing = { path = "../tracing", version = "0.2", default-features = false }
2222
tracing-core = { path = "../tracing-core", version = "0.2", default-features = false }
23-
tokio-test = { version = "0.4", optional = true }
23+
tokio-test = { version = "0.4.2", optional = true }
24+
25+
# Fix minimal-versions; tokio-test fails with otherwise acceptable 0.1.0
26+
tokio-stream = "0.1.9"
2427

2528
[package.metadata.docs.rs]
2629
all-features = true

0 commit comments

Comments
 (0)