Skip to content

Commit a3868af

Browse files
CAD97CAD97
authored
chore: fix minimal-versions correctness (#2246)
## Motivation Fix minimal-versions failure. ## Solution Upgrade all the dependencies to their most recent semver-compatible version, adjusting back down as necessary for MSRV. Essentially a cherry-pick of #2231, but redone by hand. ## Tests - `cargo minimal-versions msrv verify -- cargo check --all-features` - `cargo minimal-versions msrv verify -- cargo check --no-default-features` ## Methodology - `cargo update && cargo upgrade --to-lockfile` - Identify [a bug](killercup/cargo-edit#750) and manually resolve it - loop; upgrade transitive deps - `cargo minimal-versions check --all-features` - Identify failing dep - `cargo minimal-versions tree -i dep --all-features` - Find the closest dependency leading to pulling in `dep` - `cargo add fixdep --optional` to force a more recent more-minimal-versions-correct version - loop; downgrade to msrv - `cargo minimal-versions msrv verify -- cargo check --all-features` - Identify failing dep - `cargo minimal-versions tree -i dep --all-features` - Find the version that supports MSRV from lib.rs - `cargo upgrade dep@msrv`
1 parent e4a6b57 commit a3868af

File tree

18 files changed

+131
-120
lines changed

18 files changed

+131
-120
lines changed

‎examples/Cargo.toml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,57 @@ default = []
1111
[dev-dependencies]
1212

1313
# tracing crates
14-
tracing = { path = "../tracing", version = "0.1" }
15-
tracing-core = { path = "../tracing-core", version = "0.1" }
14+
tracing = { path = "../tracing", version = "0.1.35" }
15+
tracing-core = { path = "../tracing-core", version = "0.1.28" }
1616
tracing-error = { path = "../tracing-error" }
1717
tracing-flame = { path = "../tracing-flame" }
1818
tracing-tower = { version = "0.1.0", path = "../tracing-tower" }
19-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = ["json", "env-filter"] }
19+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", features = ["json", "env-filter"] }
2020
tracing-futures = { version = "0.2.1", path = "../tracing-futures", features = ["futures-01"] }
21-
tracing-attributes = { path = "../tracing-attributes", version = "0.1.2" }
22-
tracing-log = { path = "../tracing-log", version = "0.1.1", features = ["env_logger"] }
21+
tracing-attributes = { path = "../tracing-attributes", version = "0.1.22" }
22+
tracing-log = { path = "../tracing-log", version = "0.1.3", features = ["env_logger"] }
2323
tracing-serde = { path = "../tracing-serde" }
2424
tracing-opentelemetry = { path = "../tracing-opentelemetry" }
2525
tracing-journald = { path = "../tracing-journald" }
26-
tracing-appender = { path = "../tracing-appender", version = "0.2" }
26+
tracing-appender = { path = "../tracing-appender", version = "0.2.0" }
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.1", features = ["full"] }
3333

3434
# env-logger example
35-
env_logger = "0.9"
35+
env_logger = "0.9.0"
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"
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"
4242
bytes = "1"
43-
argh = "0.1.5"
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"
51+
inferno = "0.11.6"
5252
tempfile = "3"
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"
6161

6262
# valuable examples
6363
valuable = { version = "0.1.0", features = ["derive"] }
6464

6565
[target.'cfg(tracing_unstable)'.dependencies]
66-
tracing-core = { path = "../tracing-core", version = "0.1", features = ["valuable"]}
67-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = ["json", "env-filter", "valuable"]}
66+
tracing-core = { path = "../tracing-core", version = "0.1.28", features = ["valuable"]}
67+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", features = ["json", "env-filter", "valuable"]}

‎tracing-appender/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ 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" }
24+
crossbeam-channel = "0.5.6"
25+
time = { version = "0.3.2", default-features = false, features = ["formatting"] }
26+
parking_lot = { optional = true, version = "0.12.1" }
2727
thiserror = "1"
2828

2929
[dependencies.tracing-subscriber]
3030
path = "../tracing-subscriber"
31-
version = "0.3"
31+
version = "0.3.0"
3232
default-features = false
3333
features = ["fmt", "std"]
3434

3535
[dev-dependencies]
3636

37-
criterion = { version = "0.3", default_features = false }
38-
tracing = { path = "../tracing", version = "0.1" }
39-
time = { version = "0.3", default-features = false, features = ["formatting", "parsing"] }
37+
criterion = { version = "0.3.6", default-features = false }
38+
tracing = { path = "../tracing", version = "0.1.35" }
39+
time = { version = "0.3.2", default-features = false, features = ["formatting", "parsing"] }
4040
tempfile = "3"
4141

4242
[[bench]]
4343
name = "bench"
44-
harness = false
44+
harness = false

‎tracing-attributes/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ async-await = []
4040

4141
[dependencies]
4242
proc-macro2 = "1"
43-
syn = { version = "1.0.43", default-features = false, features = ["full", "parsing", "printing", "visit", "visit-mut", "clone-impls", "extra-traits", "proc-macro"] }
43+
syn = { version = "1.0.98", default-features = false, features = ["full", "parsing", "printing", "visit", "visit-mut", "clone-impls", "extra-traits", "proc-macro"] }
4444
quote = "1"
4545

4646
[dev-dependencies]
47-
tracing = { path = "../tracing", version = "0.1" }
47+
tracing = { path = "../tracing", version = "0.1.35" }
4848
tracing-mock = { path = "../tracing-mock", features = ["tokio-test"] }
49-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", features = ["env-filter"] }
49+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", features = ["env-filter"] }
5050
tokio-test = { version = "0.3.0" }
51-
tracing-core = { path = "../tracing-core", version = "0.1"}
52-
async-trait = "0.1.44"
51+
tracing-core = { path = "../tracing-core", version = "0.1.28"}
52+
async-trait = "0.1.56"
5353

5454
[badges]
5555
maintenance = { status = "experimental" }

‎tracing-core/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ std = ["once_cell"]
3434
maintenance = { status = "actively-developed" }
3535

3636
[dependencies]
37-
once_cell = { version = "1.12", optional = true }
37+
once_cell = { version = "1.13.0", optional = true }
3838

3939
[target.'cfg(tracing_unstable)'.dependencies]
40-
valuable = { version = "0.1.0", optional = true, default_features = false }
40+
valuable = { version = "0.1.0", optional = true, default-features = false }
4141

4242
[package.metadata.docs.rs]
4343
all-features = true
4444
# enable unstable features in the documentation
4545
rustdoc-args = ["--cfg", "docsrs", "--cfg", "tracing_unstable"]
4646
# it's necessary to _also_ pass `--cfg tracing_unstable` to rustc, or else
4747
# dependencies will not be enabled, and the docs build will fail.
48-
rustc-args = ["--cfg", "tracing_unstable"]
48+
rustc-args = ["--cfg", "tracing_unstable"]

‎tracing-error/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ default = ["traced-error"]
3939
traced-error = []
4040

4141
[dependencies]
42-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry", "fmt"] }
43-
tracing = { path = "../tracing", version = "0.1.12", default-features = false, features = ["std"] }
42+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = ["registry", "fmt"] }
43+
tracing = { path = "../tracing", version = "0.1.35", default-features = false, features = ["std"] }
4444

4545
[badges]
4646
maintenance = { status = "experimental" }

‎tracing-flame/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ default = ["smallvec"]
2626
smallvec = ["tracing-subscriber/smallvec"]
2727

2828
[dependencies]
29-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry", "fmt"] }
30-
tracing = { path = "../tracing", version = "0.1.12", default-features = false, features = ["std"] }
31-
once_cell = "1.12"
29+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = ["registry", "fmt"] }
30+
tracing = { path = "../tracing", version = "0.1.35", default-features = false, features = ["std"] }
31+
once_cell = "1.13.0"
3232

3333

3434
[dev-dependencies]

‎tracing-futures/Cargo.toml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,21 @@ 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 }
34-
tracing = { path = "../tracing", version = "0.1", default-features = false }
35-
tokio-executor = { version = "0.1", optional = true }
36-
tokio_01 = { package = "tokio", version = "0.1", 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 }
34+
tracing = { path = "../tracing", version = "0.1.35", default-features = false }
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 = { version = "0.1.18", optional = true }
40+
mio = { version = "0.6.23", optional = true }
3741

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

4347
[badges]

‎tracing-journald/Cargo.toml‎

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

1818
[dependencies]
19-
libc = "0.2.107"
20-
tracing-core = { path = "../tracing-core", version = "0.1.10" }
21-
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry"] }
19+
libc = "0.2.126"
20+
tracing-core = { path = "../tracing-core", version = "0.1.28" }
21+
tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = ["registry"] }
2222

2323
[dev-dependencies]
24-
serde_json = "1.0.68"
25-
serde = { version = "1.0.130", features = ["derive"] }
26-
tracing = { path = "../tracing", version = "0.1" }
24+
serde_json = "1.0.82"
25+
serde = { version = "1.0.140", features = ["derive"] }
26+
tracing = { path = "../tracing", version = "0.1.35" }

‎tracing-journald/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl Layer {
156156
#[cfg(not(unix))]
157157
fn send_payload(&self, _opayload: &[u8]) -> io::Result<()> {
158158
Err(io::Error::new(
159-
io::ErrorKind::Unsupported,
159+
io::ErrorKind::Other,
160160
"journald not supported on non-Unix",
161161
))
162162
}
@@ -177,7 +177,7 @@ impl Layer {
177177
#[cfg(all(unix, not(target_os = "linux")))]
178178
fn send_large_payload(&self, _payload: &[u8]) -> io::Result<usize> {
179179
Err(io::Error::new(
180-
io::ErrorKind::Unsupported,
180+
io::ErrorKind::Other,
181181
"Large payloads not supported on non-Linux OS",
182182
))
183183
}

‎tracing-log/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ trace-logger = []
2525
interest-cache = ["lru", "ahash"]
2626

2727
[dependencies]
28-
tracing-core = { path = "../tracing-core", version = "0.1.17"}
29-
log = { version = "0.4" }
30-
once_cell = "1.12"
31-
env_logger = { version = "0.8", optional = true }
32-
lru = { version = "0.7.0", optional = true }
33-
ahash = { version = "0.7.4", optional = true }
28+
tracing-core = { path = "../tracing-core", version = "0.1.28"}
29+
log = { version = "0.4.17" }
30+
once_cell = "1.13.0"
31+
env_logger = { version = "0.8.4", optional = true }
32+
lru = { version = "0.7.7", optional = true }
33+
ahash = { version = "0.7.6", optional = true }
3434

3535
[dev-dependencies]
36-
tracing = { path = "../tracing", version = "0.1"}
36+
tracing = { path = "../tracing", version = "0.1.35"}
3737
tracing-subscriber = { path = "../tracing-subscriber" }
38-
criterion = { version = "0.3", default_features = false }
38+
criterion = { version = "0.3.6", default-features = false }
3939

4040
[badges]
4141
maintenance = { status = "actively-maintained" }

0 commit comments

Comments
 (0)