Skip to content

Commit 0192304

Browse files
davidbarskyhawkw
davidbarsky
authored and
hawkw
committed
subscriber: dim Compact targets, matching the default formatter (#2409)
Fixes #2408 Just switch to use `dim` Before: ![2022-12-08_13-58-40](https://user-images.githubusercontent.com/623453/206576169-63ee4e20-b56f-4c63-a9b3-80ba2e97eec9.png) After: ![2022-12-08_13-55-36](https://user-images.githubusercontent.com/623453/206576055-878d360f-7b95-4e18-bc31-4fb6f1b71a3a.png) Full mode for comparison: ![2022-12-08_13-55-48](https://user-images.githubusercontent.com/623453/206576054-6e38852c-cb3a-4b84-98e5-50463cdb5073.png) ; Conflicts: ; tracing-subscriber/src/fmt/format/mod.rs
1 parent c71fb14 commit 0192304

File tree

39 files changed

+107
-118
lines changed

39 files changed

+107
-118
lines changed

‎.github/workflows/CI.yml

+4-15
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,9 @@ jobs:
169169
shell: bash
170170

171171
check-msrv:
172-
# Run `cargo check` on our minimum supported Rust version (1.49.0).
173-
name: "cargo check (MSRV on ubuntu-latest)"
172+
# Run `cargo check` on our minimum supported Rust version (1.56.0). This
173+
# checks with minimal versions; maximal versions are checked above.
174+
name: "cargo check (+MSRV -Zminimal-versions)"
174175
needs: check
175176
runs-on: ubuntu-latest
176177
strategy:
@@ -190,20 +191,8 @@ jobs:
190191
- tracing-tower
191192
- tracing
192193
toolchain:
193-
- 1.49.0
194+
- 1.56.0
194195
- stable
195-
# TODO(eliza): remove this when appender is on the same MSRV.
196-
# same for tracing subscriber
197-
exclude:
198-
- subcrate: tracing-appender
199-
toolchain: 1.49.0
200-
- subcrate: tracing-subscriber
201-
toolchain: 1.49.0
202-
include:
203-
- subcrate: tracing-appender
204-
toolchain: 1.53.0
205-
- subcrate: tracing-subscriber
206-
toolchain: 1.50.0
207196
steps:
208197
- uses: actions/checkout@v3
209198
- name: "install Rust ${{ env.APPENDER_MSRV }}"

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,14 @@ 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.49. The current Tracing version is not guaranteed to build on Rust
255+
version is 1.56. 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
259259
project. The current stable Rust compiler and the three most recent minor
260260
versions before it will always be supported. For example, if the current stable
261-
compiler version is 1.45, the minimum supported version will not be increased
262-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
261+
compiler version is 1.69, the minimum supported version will not be increased
262+
past 1.66, three minor versions prior. Increasing the minimum supported compiler
263263
version is not considered a semver breaking change as long as doing so complies
264264
with this policy.
265265

‎examples/Cargo.toml

+1-1
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.49.0"
6+
rust-version = "1.56.0"
77

88
[features]
99
default = []

‎tracing-appender/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ Rust versions earlier than the minimum supported version.
152152
Tracing follows the same compiler support policies as the rest of the Tokio
153153
project. The current stable Rust compiler and the three most recent minor
154154
versions before it will always be supported. For example, if the current
155-
stable compiler version is 1.45, the minimum supported version will not be
156-
increased past 1.42, three minor versions prior. Increasing the minimum
155+
stable compiler version is 1.69, the minimum supported version will not be
156+
increased past 1.66, three minor versions prior. Increasing the minimum
157157
supported compiler version is not considered a semver breaking change as
158158
long as doing so complies with this policy.
159159

‎tracing-appender/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
//! Tracing follows the same compiler support policies as the rest of the Tokio
117117
//! project. The current stable Rust compiler and the three most recent minor
118118
//! versions before it will always be supported. For example, if the current
119-
//! stable compiler version is 1.45, the minimum supported version will not be
120-
//! increased past 1.42, three minor versions prior. Increasing the minimum
119+
//! stable compiler version is 1.69, the minimum supported version will not be
120+
//! increased past 1.66, three minor versions prior. Increasing the minimum
121121
//! supported compiler version is not considered a semver breaking change as
122122
//! long as doing so complies with this policy.
123123
//!

‎tracing-attributes/Cargo.toml

+1-1
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.49.0"
31+
rust-version = "1.56.0"
3232

3333
[lib]
3434
proc-macro = true

‎tracing-attributes/README.md

+4-4
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.49+][msrv]*
40+
*Compiler support: [requires `rustc` 1.56+][msrv]*
4141

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

@@ -69,14 +69,14 @@ 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.49. The current Tracing version is not guaranteed to build on Rust
72+
version is 1.56. 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
7676
project. The current stable Rust compiler and the three most recent minor
7777
versions before it will always be supported. For example, if the current stable
78-
compiler version is 1.45, the minimum supported version will not be increased
79-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
78+
compiler version is 1.69, the minimum supported version will not be increased
79+
past 1.66, three minor versions prior. Increasing the minimum supported compiler
8080
version is not considered a semver breaking change as long as doing so complies
8181
with this policy.
8282

‎tracing-attributes/src/lib.rs

+4-4
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.49+][msrv]*
9+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
1010
//!
1111
//! [msrv]: #supported-rust-versions
1212
//!
@@ -41,14 +41,14 @@
4141
//! ## Supported Rust Versions
4242
//!
4343
//! Tracing is built against the latest stable release. The minimum supported
44-
//! version is 1.49. The current Tracing version is not guaranteed to build on
44+
//! version is 1.56. 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
4848
//! project. The current stable Rust compiler and the three most recent minor
4949
//! versions before it will always be supported. For example, if the current
50-
//! stable compiler version is 1.45, the minimum supported version will not be
51-
//! increased past 1.42, three minor versions prior. Increasing the minimum
50+
//! stable compiler version is 1.69, the minimum supported version will not be
51+
//! increased past 1.66, three minor versions prior. Increasing the minimum
5252
//! supported compiler version is not considered a semver breaking change as
5353
//! long as doing so complies with this policy.
5454
//!

‎tracing-core/Cargo.toml

+1-1
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.49.0"
27+
rust-version = "1.56.0"
2828

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

‎tracing-core/README.md

+4-4
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.49+][msrv]*
56+
*Compiler support: [requires `rustc` 1.56+][msrv]*
5757

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

@@ -99,14 +99,14 @@ 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.49. The current Tracing version is not guaranteed to build on Rust
102+
version is 1.56. 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
106106
project. The current stable Rust compiler and the three most recent minor
107107
versions before it will always be supported. For example, if the current stable
108-
compiler version is 1.45, the minimum supported version will not be increased
109-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
108+
compiler version is 1.69, the minimum supported version will not be increased
109+
past 1.69, three minor versions prior. Increasing the minimum supported compiler
110110
version is not considered a semver breaking change as long as doing so complies
111111
with this policy.
112112

‎tracing-core/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//! In addition, it defines the global callsite registry and per-thread current
2424
//! dispatcher which other components of the tracing system rely on.
2525
//!
26-
//! *Compiler support: [requires `rustc` 1.49+][msrv]*
26+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
2727
//!
2828
//! [msrv]: #supported-rust-versions
2929
//!
@@ -92,14 +92,14 @@
9292
//! ## Supported Rust Versions
9393
//!
9494
//! Tracing is built against the latest stable release. The minimum supported
95-
//! version is 1.49. The current Tracing version is not guaranteed to build on
95+
//! version is 1.56. The current Tracing version is not guaranteed to build on
9696
//! Rust versions earlier than the minimum supported version.
9797
//!
9898
//! Tracing follows the same compiler support policies as the rest of the Tokio
9999
//! project. The current stable Rust compiler and the three most recent minor
100100
//! versions before it will always be supported. For example, if the current
101-
//! stable compiler version is 1.45, the minimum supported version will not be
102-
//! increased past 1.42, three minor versions prior. Increasing the minimum
101+
//! stable compiler version is 1.69, the minimum supported version will not be
102+
//! increased past 1.66, three minor versions prior. Increasing the minimum
103103
//! supported compiler version is not considered a semver breaking change as
104104
//! long as doing so complies with this policy.
105105
//!

‎tracing-error/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ keywords = [
3232
"backtrace"
3333
]
3434
edition = "2018"
35-
rust-version = "1.49.0"
35+
rust-version = "1.56.0"
3636

3737
[features]
3838
default = ["traced-error"]

‎tracing-error/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The crate provides the following:
4848

4949
**Note**: This crate is currently experimental.
5050

51-
*Compiler support: [requires `rustc` 1.49+][msrv]*
51+
*Compiler support: [requires `rustc` 1.56+][msrv]*
5252

5353
[msrv]: #supported-rust-versions
5454

@@ -186,14 +186,14 @@ fn main() {
186186
## Supported Rust Versions
187187

188188
Tracing is built against the latest stable release. The minimum supported
189-
version is 1.49. The current Tracing version is not guaranteed to build on Rust
189+
version is 1.56. The current Tracing version is not guaranteed to build on Rust
190190
versions earlier than the minimum supported version.
191191

192192
Tracing follows the same compiler support policies as the rest of the Tokio
193193
project. The current stable Rust compiler and the three most recent minor
194194
versions before it will always be supported. For example, if the current stable
195-
compiler version is 1.45, the minimum supported version will not be increased
196-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
195+
compiler version is 1.69, the minimum supported version will not be increased
196+
past 1.66, three minor versions prior. Increasing the minimum supported compiler
197197
version is not considered a semver breaking change as long as doing so complies
198198
with this policy.
199199

‎tracing-error/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//!
1919
//! **Note**: This crate is currently experimental.
2020
//!
21-
//! *Compiler support: [requires `rustc` 1.49+][msrv]*
21+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
2222
//!
2323
//! [msrv]: #supported-rust-versions
2424
//!
@@ -167,14 +167,14 @@
167167
//! ## Supported Rust Versions
168168
//!
169169
//! Tracing is built against the latest stable release. The minimum supported
170-
//! version is 1.49. The current Tracing version is not guaranteed to build on
170+
//! version is 1.56. The current Tracing version is not guaranteed to build on
171171
//! Rust versions earlier than the minimum supported version.
172172
//!
173173
//! Tracing follows the same compiler support policies as the rest of the Tokio
174174
//! project. The current stable Rust compiler and the three most recent minor
175175
//! versions before it will always be supported. For example, if the current
176-
//! stable compiler version is 1.45, the minimum supported version will not be
177-
//! increased past 1.42, three minor versions prior. Increasing the minimum
176+
//! stable compiler version is 1.69, the minimum supported version will not be
177+
//! increased past 1.66, three minor versions prior. Increasing the minimum
178178
//! supported compiler version is not considered a semver breaking change as
179179
//! long as doing so complies with this policy.
180180
//!

‎tracing-flame/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ categories = [
1919
"asynchronous",
2020
]
2121
keywords = ["tracing", "subscriber", "flamegraph", "profiling"]
22-
rust-version = "1.49.0"
22+
rust-version = "1.56.0"
2323

2424
[features]
2525
default = ["smallvec"]

‎tracing-flame/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ flamegraph/flamechart. Flamegraphs/flamecharts are useful for identifying perfor
2626
bottlenecks in an application. For more details, see Brendan Gregg's [post]
2727
on flamegraphs.
2828

29-
*Compiler support: [requires `rustc` 1.49+][msrv]*
29+
*Compiler support: [requires `rustc` 1.56+][msrv]*
3030

3131
[msrv]: #supported-rust-versions
3232
[post]: http://www.brendangregg.com/flamegraphs.html
@@ -106,14 +106,14 @@ _flamechart_, which _does not_ sort or collapse identical stack frames.
106106
## Supported Rust Versions
107107

108108
Tracing is built against the latest stable release. The minimum supported
109-
version is 1.49. The current Tracing version is not guaranteed to build on Rust
109+
version is 1.56. The current Tracing version is not guaranteed to build on Rust
110110
versions earlier than the minimum supported version.
111111

112112
Tracing follows the same compiler support policies as the rest of the Tokio
113113
project. The current stable Rust compiler and the three most recent minor
114114
versions before it will always be supported. For example, if the current stable
115-
compiler version is 1.45, the minimum supported version will not be increased
116-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
115+
compiler version is 1.69, the minimum supported version will not be increased
116+
past 1.66, three minor versions prior. Increasing the minimum supported compiler
117117
version is not considered a semver breaking change as long as doing so complies
118118
with this policy.
119119

‎tracing-flame/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//! issues bottlenecks in an application. For more details, see Brendan Gregg's [post]
1111
//! on flamegraphs.
1212
//!
13-
//! *Compiler support: [requires `rustc` 1.49+][msrv]*
13+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
1414
//!
1515
//! [msrv]: #supported-rust-versions
1616
//! [post]: http://www.brendangregg.com/flamegraphs.html
@@ -95,14 +95,14 @@
9595
//! ## Supported Rust Versions
9696
//!
9797
//! Tracing is built against the latest stable release. The minimum supported
98-
//! version is 1.49. The current Tracing version is not guaranteed to build on
98+
//! version is 1.56. The current Tracing version is not guaranteed to build on
9999
//! Rust versions earlier than the minimum supported version.
100100
//!
101101
//! Tracing follows the same compiler support policies as the rest of the Tokio
102102
//! project. The current stable Rust compiler and the three most recent minor
103103
//! versions before it will always be supported. For example, if the current
104-
//! stable compiler version is 1.45, the minimum supported version will not be
105-
//! increased past 1.42, three minor versions prior. Increasing the minimum
104+
//! stable compiler version is 1.69, the minimum supported version will not be
105+
//! increased past 1.66, three minor versions prior. Increasing the minimum
106106
//! supported compiler version is not considered a semver breaking change as
107107
//! long as doing so complies with this policy.
108108
//!

‎tracing-futures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ categories = [
1616
]
1717
keywords = ["logging", "profiling", "tracing", "futures", "async"]
1818
license = "MIT"
19-
rust-version = "1.49.0"
19+
rust-version = "1.56.0"
2020

2121
[features]
2222
default = ["std-future", "std"]

‎tracing-futures/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ The crate provides the following traits:
5151
[`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/index.html
5252
[`tracing`]: https://crates.io/crates/tracing
5353

54-
*Compiler support: [requires `rustc` 1.49+][msrv]*
54+
*Compiler support: [requires `rustc` 1.56+][msrv]*
5555

5656
[msrv]: #supported-rust-versions
5757

5858
## Supported Rust Versions
5959

6060
Tracing is built against the latest stable release. The minimum supported
61-
version is 1.49. The current Tracing version is not guaranteed to build on Rust
61+
version is 1.56. The current Tracing version is not guaranteed to build on Rust
6262
versions earlier than the minimum supported version.
6363

6464
Tracing follows the same compiler support policies as the rest of the Tokio
6565
project. The current stable Rust compiler and the three most recent minor
6666
versions before it will always be supported. For example, if the current stable
67-
compiler version is 1.45, the minimum supported version will not be increased
68-
past 1.42, three minor versions prior. Increasing the minimum supported compiler
67+
compiler version is 1.69, the minimum supported version will not be increased
68+
past 1.66, three minor versions prior. Increasing the minimum supported compiler
6969
version is not considered a semver breaking change as long as doing so complies
7070
with this policy.
7171

‎tracing-futures/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! * [`WithSubscriber`] allows a `tracing` [`Subscriber`] to be attached to a
1616
//! future, sink, stream, or executor.
1717
//!
18-
//! *Compiler support: [requires `rustc` 1.49+][msrv]*
18+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
1919
//!
2020
//! [msrv]: #supported-rust-versions
2121
//!
@@ -59,14 +59,14 @@
5959
//! ## Supported Rust Versions
6060
//!
6161
//! Tracing is built against the latest stable release. The minimum supported
62-
//! version is 1.49. The current Tracing version is not guaranteed to build on
62+
//! version is 1.56. The current Tracing version is not guaranteed to build on
6363
//! Rust versions earlier than the minimum supported version.
6464
//!
6565
//! Tracing follows the same compiler support policies as the rest of the Tokio
6666
//! project. The current stable Rust compiler and the three most recent minor
6767
//! versions before it will always be supported. For example, if the current
68-
//! stable compiler version is 1.45, the minimum supported version will not be
69-
//! increased past 1.42, three minor versions prior. Increasing the minimum
68+
//! stable compiler version is 1.69, the minimum supported version will not be
69+
//! increased past 1.66, three minor versions prior. Increasing the minimum
7070
//! supported compiler version is not considered a semver breaking change as
7171
//! long as doing so complies with this policy.
7272
//!

0 commit comments

Comments
 (0)