Skip to content

Commit a1b89f0

Browse files
committed
Auto merge of rust-lang#81135 - jyn514:no-backticks, r=flip1995
Fix formatting for removed lints - Don't add backticks for the reason a lint was removed. This is almost never a code block, and when it is the backticks should be in the reason itself. - Don't assume clippy is the only tool that needs to be checked for backwards compatibility I split this out of rust-lang#80527 because it kept causing tests to fail, and it's a good change to have anyway. r? `@flip1995`
2 parents 2be935d + abb40c9 commit a1b89f0

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

tests/ui/deprecated.stderr

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
1-
error: lint `clippy::unstable_as_slice` has been removed: ``Vec::as_slice` has been stabilized in 1.7`
1+
error: lint `clippy::unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
22
--> $DIR/deprecated.rs:1:8
33
|
44
LL | #[warn(clippy::unstable_as_slice)]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `-D renamed-and-removed-lints` implied by `-D warnings`
88

9-
error: lint `clippy::unstable_as_mut_slice` has been removed: ``Vec::as_mut_slice` has been stabilized in 1.7`
9+
error: lint `clippy::unstable_as_mut_slice` has been removed: `Vec::as_mut_slice` has been stabilized in 1.7
1010
--> $DIR/deprecated.rs:2:8
1111
|
1212
LL | #[warn(clippy::unstable_as_mut_slice)]
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1414

15-
error: lint `clippy::misaligned_transmute` has been removed: `this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr`
15+
error: lint `clippy::misaligned_transmute` has been removed: this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr
1616
--> $DIR/deprecated.rs:3:8
1717
|
1818
LL | #[warn(clippy::misaligned_transmute)]
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2020

21-
error: lint `clippy::unused_collect` has been removed: ``collect` has been marked as #[must_use] in rustc and that covers all cases of this lint`
21+
error: lint `clippy::unused_collect` has been removed: `collect` has been marked as #[must_use] in rustc and that covers all cases of this lint
2222
--> $DIR/deprecated.rs:4:8
2323
|
2424
LL | #[warn(clippy::unused_collect)]
2525
| ^^^^^^^^^^^^^^^^^^^^^^
2626

27-
error: lint `clippy::invalid_ref` has been removed: `superseded by rustc lint `invalid_value``
27+
error: lint `clippy::invalid_ref` has been removed: superseded by rustc lint `invalid_value`
2828
--> $DIR/deprecated.rs:5:8
2929
|
3030
LL | #[warn(clippy::invalid_ref)]
3131
| ^^^^^^^^^^^^^^^^^^^
3232

33-
error: lint `clippy::into_iter_on_array` has been removed: `this lint has been uplifted to rustc and is now called `array_into_iter``
33+
error: lint `clippy::into_iter_on_array` has been removed: this lint has been uplifted to rustc and is now called `array_into_iter`
3434
--> $DIR/deprecated.rs:6:8
3535
|
3636
LL | #[warn(clippy::into_iter_on_array)]
3737
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3838

39-
error: lint `clippy::unused_label` has been removed: `this lint has been uplifted to rustc and is now called `unused_labels``
39+
error: lint `clippy::unused_label` has been removed: this lint has been uplifted to rustc and is now called `unused_labels`
4040
--> $DIR/deprecated.rs:7:8
4141
|
4242
LL | #[warn(clippy::unused_label)]
4343
| ^^^^^^^^^^^^^^^^^^^^
4444

45-
error: lint `clippy::regex_macro` has been removed: `the regex! macro has been removed from the regex crate in 2018`
45+
error: lint `clippy::regex_macro` has been removed: the regex! macro has been removed from the regex crate in 2018
4646
--> $DIR/deprecated.rs:8:8
4747
|
4848
LL | #[warn(clippy::regex_macro)]
4949
| ^^^^^^^^^^^^^^^^^^^
5050

51-
error: lint `clippy::drop_bounds` has been removed: `this lint has been uplifted to rustc and is now called `drop_bounds``
51+
error: lint `clippy::drop_bounds` has been removed: this lint has been uplifted to rustc and is now called `drop_bounds`
5252
--> $DIR/deprecated.rs:9:8
5353
|
5454
LL | #[warn(clippy::drop_bounds)]
5555
| ^^^^^^^^^^^^^^^^^^^
5656

57-
error: lint `clippy::temporary_cstring_as_ptr` has been removed: `this lint has been uplifted to rustc and is now called `temporary_cstring_as_ptr``
57+
error: lint `clippy::temporary_cstring_as_ptr` has been removed: this lint has been uplifted to rustc and is now called `temporary_cstring_as_ptr`
5858
--> $DIR/deprecated.rs:10:8
5959
|
6060
LL | #[warn(clippy::temporary_cstring_as_ptr)]
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6262

63-
error: lint `clippy::panic_params` has been removed: `this lint has been uplifted to rustc and is now called `panic_fmt``
63+
error: lint `clippy::panic_params` has been removed: this lint has been uplifted to rustc and is now called `panic_fmt`
6464
--> $DIR/deprecated.rs:11:8
6565
|
6666
LL | #[warn(clippy::panic_params)]
6767
| ^^^^^^^^^^^^^^^^^^^^
6868

69-
error: lint `clippy::unknown_clippy_lints` has been removed: `this lint has been integrated into the `unknown_lints` rustc lint`
69+
error: lint `clippy::unknown_clippy_lints` has been removed: this lint has been integrated into the `unknown_lints` rustc lint
7070
--> $DIR/deprecated.rs:12:8
7171
|
7272
LL | #[warn(clippy::unknown_clippy_lints)]
7373
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7474

75-
error: lint `clippy::unstable_as_slice` has been removed: ``Vec::as_slice` has been stabilized in 1.7`
75+
error: lint `clippy::unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
7676
--> $DIR/deprecated.rs:1:8
7777
|
7878
LL | #[warn(clippy::unstable_as_slice)]

tests/ui/deprecated_old.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
error: lint `unstable_as_slice` has been removed: ``Vec::as_slice` has been stabilized in 1.7`
1+
error: lint `unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
22
--> $DIR/deprecated_old.rs:1:8
33
|
44
LL | #[warn(unstable_as_slice)]
55
| ^^^^^^^^^^^^^^^^^
66
|
77
= note: `-D renamed-and-removed-lints` implied by `-D warnings`
88

9-
error: lint `unstable_as_mut_slice` has been removed: ``Vec::as_mut_slice` has been stabilized in 1.7`
9+
error: lint `unstable_as_mut_slice` has been removed: `Vec::as_mut_slice` has been stabilized in 1.7
1010
--> $DIR/deprecated_old.rs:2:8
1111
|
1212
LL | #[warn(unstable_as_mut_slice)]
1313
| ^^^^^^^^^^^^^^^^^^^^^
1414

15-
error: lint `misaligned_transmute` has been removed: `this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr`
15+
error: lint `misaligned_transmute` has been removed: this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr
1616
--> $DIR/deprecated_old.rs:3:8
1717
|
1818
LL | #[warn(misaligned_transmute)]
1919
| ^^^^^^^^^^^^^^^^^^^^
2020

21-
error: lint `unstable_as_slice` has been removed: ``Vec::as_slice` has been stabilized in 1.7`
21+
error: lint `unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
2222
--> $DIR/deprecated_old.rs:1:8
2323
|
2424
LL | #[warn(unstable_as_slice)]

0 commit comments

Comments
 (0)