Skip to content

Commit d0fb2f3

Browse files
committed
chore: bump MSRV to 1.63 (#2793)
1 parent caba13d commit d0fb2f3

File tree

41 files changed

+65
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+65
-85
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
shell: bash
170170

171171
check-msrv:
172-
# Run `cargo check` on our minimum supported Rust version (1.56.0). This
172+
# Run `cargo check` on our minimum supported Rust version (1.63.0). This
173173
# checks with minimal versions; maximal versions are checked above.
174174
name: "cargo check (+MSRV -Zminimal-versions)"
175175
needs: check
@@ -191,7 +191,7 @@ jobs:
191191
- tracing-tower
192192
- tracing
193193
toolchain:
194-
- 1.56.0
194+
- 1.63.0
195195
- stable
196196
steps:
197197
- uses: actions/checkout@v3
@@ -316,9 +316,6 @@ jobs:
316316

317317
test-features-stable:
318318
# Feature flag tests that run on stable Rust.
319-
# TODO(david): once tracing's MSRV goes up to Rust 1.51, we should be able to switch to
320-
# using cargo's V2 feature resolver (https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions)
321-
# and avoid cd'ing into each crate's directory.
322319
name: cargo test (feature-specific)
323320
needs: check
324321
runs-on: ubuntu-latest
@@ -331,30 +328,22 @@ jobs:
331328
override: true
332329
- name: "Test log support"
333330
run: cargo test
334-
working-directory: "tracing/test-log-support"
335331
- name: "Test static max level"
336332
run: cargo test
337-
working-directory: "tracing/test_static_max_level_features"
338333
- name: "Test static max level (release)"
339334
run: cargo test --release
340-
working-directory: "tracing/test_static_max_level_features"
341335
- name: "Test tracing-core no-std support"
342336
run: cargo test --no-default-features
343-
working-directory: tracing-core
344337
- name: "Test tracing no-std support"
345-
run: cargo test --lib --no-default-features
346-
working-directory: tracing
338+
run: cargo test --no-default-features
347339
# this skips running doctests under the `--no-default-features` flag,
348340
# as rustdoc isn't aware of cargo's feature flags.
349341
- name: "Test tracing-subscriber no-std support"
350342
run: cargo test --lib --tests --no-default-features
351-
working-directory: tracing-subscriber
352343
- name: "Test tracing-subscriber with liballoc only"
353344
run: cargo test --lib --tests --no-default-features --features "alloc"
354-
working-directory: tracing-subscriber
355345
- name: "Test tracing-subscriber with no default features"
356346
run: cargo test --lib --tests --no-default-features --features "std"
357-
working-directory: tracing-subscriber
358347

359348
# all required checks except for the main test run (which we only require
360349
# specific matrix combinations from)

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
2+
resolver = "2"
33
members = [
44
"tracing",
55
"tracing-core",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ attachment that `Future::instrument` does.
252252
## Supported Rust Versions
253253

254254
Tracing is built against the latest stable release. The minimum supported
255-
version is 1.56. The current Tracing version is not guaranteed to build on Rust
255+
version is 1.63. The current Tracing version is not guaranteed to build on Rust
256256
versions earlier than the minimum supported version.
257257

258258
Tracing follows the same compiler support policies as the rest of the Tokio

examples/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "tracing-examples"
33
version = "0.0.0"
44
publish = false
55
edition = "2018"
6-
rust-version = "1.56.0"
6+
rust-version = "1.63.0"
77

88
[features]
99
default = []

tracing-attributes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ keywords = ["logging", "tracing", "macro", "instrument", "log"]
2828
license = "MIT"
2929
readme = "README.md"
3030
edition = "2018"
31-
rust-version = "1.56.0"
31+
rust-version = "1.63.0"
3232

3333
[lib]
3434
proc-macro = true

tracing-attributes/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ structured, event-based diagnostic information. This crate provides the
3737

3838
Note that this macro is also re-exported by the main `tracing` crate.
3939

40-
*Compiler support: [requires `rustc` 1.56+][msrv]*
40+
*Compiler support: [requires `rustc` 1.63+][msrv]*
4141

4242
[msrv]: #supported-rust-versions
4343

@@ -69,7 +69,7 @@ pub fn my_function(my_arg: usize) {
6969
## Supported Rust Versions
7070

7171
Tracing is built against the latest stable release. The minimum supported
72-
version is 1.56. The current Tracing version is not guaranteed to build on Rust
72+
version is 1.63. The current Tracing version is not guaranteed to build on Rust
7373
versions earlier than the minimum supported version.
7474

7575
Tracing follows the same compiler support policies as the rest of the Tokio

tracing-attributes/src/attr.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,19 +268,14 @@ impl Parse for Skips {
268268
}
269269
}
270270

271-
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
271+
#[derive(Clone, Debug, Hash, PartialEq, Eq, Default)]
272272
pub(crate) enum FormatMode {
273+
#[default]
273274
Default,
274275
Display,
275276
Debug,
276277
}
277278

278-
impl Default for FormatMode {
279-
fn default() -> Self {
280-
FormatMode::Default
281-
}
282-
}
283-
284279
#[derive(Clone, Debug)]
285280
pub(crate) struct Fields(pub(crate) Punctuated<Field, Token![,]>);
286281

tracing-attributes/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//!
77
//! Note that this macro is also re-exported by the main `tracing` crate.
88
//!
9-
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
9+
//! *Compiler support: [requires `rustc` 1.63+][msrv]*
1010
//!
1111
//! [msrv]: #supported-rust-versions
1212
//!
@@ -41,7 +41,7 @@
4141
//! ## Supported Rust Versions
4242
//!
4343
//! Tracing is built against the latest stable release. The minimum supported
44-
//! version is 1.56. The current Tracing version is not guaranteed to build on
44+
//! version is 1.63. The current Tracing version is not guaranteed to build on
4545
//! Rust versions earlier than the minimum supported version.
4646
//!
4747
//! Tracing follows the same compiler support policies as the rest of the Tokio

tracing-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ categories = [
2424
]
2525
keywords = ["logging", "tracing", "profiling"]
2626
edition = "2018"
27-
rust-version = "1.56.0"
27+
rust-version = "1.63.0"
2828

2929
[features]
3030
default = ["std", "valuable/std"]

tracing-core/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The crate provides:
5353
In addition, it defines the global callsite registry and per-thread current
5454
dispatcher which other components of the tracing system rely on.
5555

56-
*Compiler support: [requires `rustc` 1.56+][msrv]*
56+
*Compiler support: [requires `rustc` 1.63+][msrv]*
5757

5858
[msrv]: #supported-rust-versions
5959

@@ -99,7 +99,7 @@ The following crate feature flags are available:
9999
## Supported Rust Versions
100100

101101
Tracing is built against the latest stable release. The minimum supported
102-
version is 1.56. The current Tracing version is not guaranteed to build on Rust
102+
version is 1.63. The current Tracing version is not guaranteed to build on Rust
103103
versions earlier than the minimum supported version.
104104

105105
Tracing follows the same compiler support policies as the rest of the Tokio

0 commit comments

Comments
 (0)