Skip to content

Commit bac2508

Browse files
authored
chore: fixes for clippy changes in Rust 1.74 (#2814)
With the release of Rust 1.74, there are some new or modified clippy lints that need adaption in the code. The main change was the removal of the `private_in_public`. https://rust-lang.github.io/rfcs/2145-type-privacy.html Then two more changes were required, in one case to adhere a lint and the other to allow it. When talking about what an "application" needs to do when setting up `tracing-error`, it makes sense to include `fn main()` in the doctest, even though the lint recommends against it.
1 parent 8ba80ae commit bac2508

File tree

12 files changed

+24
-12
lines changed

12 files changed

+24
-12
lines changed

Diff for: examples/examples/map-traced-error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn do_something() -> Result<(), TracedError<OuterError>> {
4444

4545
#[tracing::instrument]
4646
fn do_the_real_stuff() -> Result<(), TracedError<InnerError>> {
47-
Err(InnerError).map_err(TracedError::from)
47+
Err(TracedError::from(InnerError))
4848
}
4949

5050
#[derive(Debug)]

Diff for: tracing-appender/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@
153153
overflowing_literals,
154154
path_statements,
155155
patterns_in_fns_without_body,
156-
private_in_public,
156+
private_interfaces,
157+
private_bounds,
157158
unconditional_recursion,
158159
unused,
159160
unused_allocation,

Diff for: tracing-attributes/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
overflowing_literals,
7171
path_statements,
7272
patterns_in_fns_without_body,
73-
private_in_public,
73+
private_interfaces,
74+
private_bounds,
7475
unconditional_recursion,
7576
unused_allocation,
7677
unused_comparisons,

Diff for: tracing-core/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@
152152
overflowing_literals,
153153
path_statements,
154154
patterns_in_fns_without_body,
155-
private_in_public,
155+
private_interfaces,
156+
private_bounds,
156157
unconditional_recursion,
157158
unused,
158159
unused_allocation,

Diff for: tracing-error/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
html_favicon_url = "https://raw.githubusercontent.com/tokio-rs/tracing/master/assets/favicon.ico",
184184
issue_tracker_base_url = "https://github.com/tokio-rs/tracing/issues/"
185185
)]
186+
#![allow(clippy::needless_doctest_main)]
186187
#![warn(
187188
missing_debug_implementations,
188189
missing_docs,
@@ -196,7 +197,8 @@
196197
overflowing_literals,
197198
path_statements,
198199
patterns_in_fns_without_body,
199-
private_in_public,
200+
private_interfaces,
201+
private_bounds,
200202
unconditional_recursion,
201203
unused,
202204
unused_allocation,

Diff for: tracing-flame/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@
124124
overflowing_literals,
125125
path_statements,
126126
patterns_in_fns_without_body,
127-
private_in_public,
127+
private_interfaces,
128+
private_bounds,
128129
unconditional_recursion,
129130
unused,
130131
unused_allocation,

Diff for: tracing-futures/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
overflowing_literals,
9090
path_statements,
9191
patterns_in_fns_without_body,
92-
private_in_public,
92+
private_interfaces,
93+
private_bounds,
9394
unconditional_recursion,
9495
unused,
9596
unused_allocation,

Diff for: tracing-log/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
overflowing_literals,
116116
path_statements,
117117
patterns_in_fns_without_body,
118-
private_in_public,
118+
private_interfaces,
119+
private_bounds,
119120
unconditional_recursion,
120121
unused,
121122
unused_allocation,

Diff for: tracing-serde/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@
159159
overflowing_literals,
160160
path_statements,
161161
patterns_in_fns_without_body,
162-
private_in_public,
162+
private_interfaces,
163+
private_bounds,
163164
unconditional_recursion,
164165
unused,
165166
unused_allocation,

Diff for: tracing-subscriber/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@
156156
overflowing_literals,
157157
path_statements,
158158
patterns_in_fns_without_body,
159-
private_in_public,
159+
private_interfaces,
160+
private_bounds,
160161
unconditional_recursion,
161162
unused,
162163
unused_allocation,

Diff for: tracing-tower/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
overflowing_literals,
1818
path_statements,
1919
patterns_in_fns_without_body,
20-
private_in_public,
20+
private_interfaces,
21+
private_bounds,
2122
unconditional_recursion,
2223
unused,
2324
unused_allocation,

Diff for: tracing/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,8 @@
948948
overflowing_literals,
949949
path_statements,
950950
patterns_in_fns_without_body,
951-
private_in_public,
951+
private_interfaces,
952+
private_bounds,
952953
unconditional_recursion,
953954
unused,
954955
unused_allocation,

0 commit comments

Comments
 (0)