Skip to content

Commit ed71add

Browse files
committed
Auto merge of rust-lang#7885 - devonhollowood:deprecated-cleanup, r=llogiq
Clean up `tests/ui/deprecated.rs` Clean up `tests/ui/deprecated.rs` Along with rust-lang#7884, this fixes rust-lang#7057 changelog: none
2 parents 962e21c + e48ab44 commit ed71add

File tree

3 files changed

+80
-84
lines changed

3 files changed

+80
-84
lines changed

clippy_lints/src/deprecated_lints.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// NOTE: if you add a deprecated lint in this file, please add a corresponding test in
2+
// tests/ui/deprecated.rs
3+
14
/// This struct fakes the `Lint` declaration that is usually created by `declare_lint!`. This
25
/// enables the simple extraction of the metadata without changing the current deprecation
36
/// declaration.

tests/ui/deprecated.rs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
#[warn(clippy::unstable_as_slice)]
2-
#[warn(clippy::unstable_as_mut_slice)]
3-
#[warn(clippy::misaligned_transmute)]
4-
#[warn(clippy::unused_collect)]
5-
#[warn(clippy::invalid_ref)]
6-
#[warn(clippy::into_iter_on_array)]
7-
#[warn(clippy::unused_label)]
8-
#[warn(clippy::regex_macro)]
9-
#[warn(clippy::drop_bounds)]
10-
#[warn(clippy::temporary_cstring_as_ptr)]
11-
#[warn(clippy::panic_params)]
12-
#[warn(clippy::unknown_clippy_lints)]
13-
#[warn(clippy::find_map)]
14-
#[warn(clippy::filter_map)]
15-
#[warn(clippy::pub_enum_variant_names)]
16-
#[warn(clippy::wrong_pub_self_convention)]
17-
#[warn(clippy::invalid_atomic_ordering)]
1+
#![warn(clippy::should_assert_eq)]
2+
#![warn(clippy::extend_from_slice)]
3+
#![warn(clippy::range_step_by_zero)]
4+
#![warn(clippy::unstable_as_slice)]
5+
#![warn(clippy::unstable_as_mut_slice)]
6+
#![warn(clippy::misaligned_transmute)]
7+
#![warn(clippy::assign_ops)]
8+
#![warn(clippy::if_let_redundant_pattern_matching)]
9+
#![warn(clippy::unsafe_vector_initialization)]
10+
#![warn(clippy::unused_collect)]
11+
#![warn(clippy::replace_consts)]
12+
#![warn(clippy::regex_macro)]
13+
#![warn(clippy::find_map)]
14+
#![warn(clippy::filter_map)]
15+
#![warn(clippy::pub_enum_variant_names)]
16+
#![warn(clippy::wrong_pub_self_convention)]
1817

1918
fn main() {}

tests/ui/deprecated.stderr

Lines changed: 61 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,100 @@
1-
error: lint `clippy::unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
2-
--> $DIR/deprecated.rs:1:8
1+
error: lint `clippy::should_assert_eq` has been removed: `assert!()` will be more flexible with RFC 2011
2+
--> $DIR/deprecated.rs:1:9
33
|
4-
LL | #[warn(clippy::unstable_as_slice)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | #![warn(clippy::should_assert_eq)]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
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
10-
--> $DIR/deprecated.rs:2:8
9+
error: lint `clippy::extend_from_slice` has been removed: `.extend_from_slice(_)` is a faster way to extend a Vec by a slice
10+
--> $DIR/deprecated.rs:2:9
1111
|
12-
LL | #[warn(clippy::unstable_as_mut_slice)]
13-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12+
LL | #![warn(clippy::extend_from_slice)]
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1414

15-
error: lint `clippy::misaligned_transmute` has been removed: this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr
16-
--> $DIR/deprecated.rs:3:8
15+
error: lint `clippy::range_step_by_zero` has been removed: `iterator.step_by(0)` panics nowadays
16+
--> $DIR/deprecated.rs:3:9
1717
|
18-
LL | #[warn(clippy::misaligned_transmute)]
19-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
LL | #![warn(clippy::range_step_by_zero)]
19+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
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
22-
--> $DIR/deprecated.rs:4:8
21+
error: lint `clippy::unstable_as_slice` has been removed: `Vec::as_slice` has been stabilized in 1.7
22+
--> $DIR/deprecated.rs:4:9
2323
|
24-
LL | #[warn(clippy::unused_collect)]
25-
| ^^^^^^^^^^^^^^^^^^^^^^
24+
LL | #![warn(clippy::unstable_as_slice)]
25+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
2626

27-
error: lint `clippy::invalid_ref` has been renamed to `invalid_value`
28-
--> $DIR/deprecated.rs:5:8
27+
error: lint `clippy::unstable_as_mut_slice` has been removed: `Vec::as_mut_slice` has been stabilized in 1.7
28+
--> $DIR/deprecated.rs:5:9
2929
|
30-
LL | #[warn(clippy::invalid_ref)]
31-
| ^^^^^^^^^^^^^^^^^^^ help: use the new name: `invalid_value`
30+
LL | #![warn(clippy::unstable_as_mut_slice)]
31+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3232

33-
error: lint `clippy::into_iter_on_array` has been renamed to `array_into_iter`
34-
--> $DIR/deprecated.rs:6:8
33+
error: lint `clippy::misaligned_transmute` has been removed: this lint has been split into cast_ptr_alignment and transmute_ptr_to_ptr
34+
--> $DIR/deprecated.rs:6:9
3535
|
36-
LL | #[warn(clippy::into_iter_on_array)]
37-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `array_into_iter`
36+
LL | #![warn(clippy::misaligned_transmute)]
37+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3838

39-
error: lint `clippy::unused_label` has been renamed to `unused_labels`
40-
--> $DIR/deprecated.rs:7:8
39+
error: lint `clippy::assign_ops` has been removed: using compound assignment operators (e.g., `+=`) is harmless
40+
--> $DIR/deprecated.rs:7:9
4141
|
42-
LL | #[warn(clippy::unused_label)]
43-
| ^^^^^^^^^^^^^^^^^^^^ help: use the new name: `unused_labels`
42+
LL | #![warn(clippy::assign_ops)]
43+
| ^^^^^^^^^^^^^^^^^^
4444

45-
error: lint `clippy::regex_macro` has been removed: the regex! macro has been removed from the regex crate in 2018
46-
--> $DIR/deprecated.rs:8:8
45+
error: lint `clippy::if_let_redundant_pattern_matching` has been removed: this lint has been changed to redundant_pattern_matching
46+
--> $DIR/deprecated.rs:8:9
4747
|
48-
LL | #[warn(clippy::regex_macro)]
49-
| ^^^^^^^^^^^^^^^^^^^
48+
LL | #![warn(clippy::if_let_redundant_pattern_matching)]
49+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5050

51-
error: lint `clippy::drop_bounds` has been renamed to `drop_bounds`
52-
--> $DIR/deprecated.rs:9:8
51+
error: lint `clippy::unsafe_vector_initialization` has been removed: the replacement suggested by this lint had substantially different behavior
52+
--> $DIR/deprecated.rs:9:9
5353
|
54-
LL | #[warn(clippy::drop_bounds)]
55-
| ^^^^^^^^^^^^^^^^^^^ help: use the new name: `drop_bounds`
54+
LL | #![warn(clippy::unsafe_vector_initialization)]
55+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5656

57-
error: lint `clippy::temporary_cstring_as_ptr` has been renamed to `temporary_cstring_as_ptr`
58-
--> $DIR/deprecated.rs:10:8
57+
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
58+
--> $DIR/deprecated.rs:10:9
5959
|
60-
LL | #[warn(clippy::temporary_cstring_as_ptr)]
61-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `temporary_cstring_as_ptr`
60+
LL | #![warn(clippy::unused_collect)]
61+
| ^^^^^^^^^^^^^^^^^^^^^^
6262

63-
error: lint `clippy::panic_params` has been renamed to `non_fmt_panics`
64-
--> $DIR/deprecated.rs:11:8
63+
error: lint `clippy::replace_consts` has been removed: associated-constants `MIN`/`MAX` of integers are preferred to `{min,max}_value()` and module constants
64+
--> $DIR/deprecated.rs:11:9
6565
|
66-
LL | #[warn(clippy::panic_params)]
67-
| ^^^^^^^^^^^^^^^^^^^^ help: use the new name: `non_fmt_panics`
66+
LL | #![warn(clippy::replace_consts)]
67+
| ^^^^^^^^^^^^^^^^^^^^^^
6868

69-
error: lint `clippy::unknown_clippy_lints` has been renamed to `unknown_lints`
70-
--> $DIR/deprecated.rs:12:8
69+
error: lint `clippy::regex_macro` has been removed: the regex! macro has been removed from the regex crate in 2018
70+
--> $DIR/deprecated.rs:12:9
7171
|
72-
LL | #[warn(clippy::unknown_clippy_lints)]
73-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `unknown_lints`
72+
LL | #![warn(clippy::regex_macro)]
73+
| ^^^^^^^^^^^^^^^^^^^
7474

7575
error: lint `clippy::find_map` has been removed: this lint has been replaced by `manual_find_map`, a more specific lint
76-
--> $DIR/deprecated.rs:13:8
76+
--> $DIR/deprecated.rs:13:9
7777
|
78-
LL | #[warn(clippy::find_map)]
79-
| ^^^^^^^^^^^^^^^^
78+
LL | #![warn(clippy::find_map)]
79+
| ^^^^^^^^^^^^^^^^
8080

8181
error: lint `clippy::filter_map` has been removed: this lint has been replaced by `manual_filter_map`, a more specific lint
82-
--> $DIR/deprecated.rs:14:8
82+
--> $DIR/deprecated.rs:14:9
8383
|
84-
LL | #[warn(clippy::filter_map)]
85-
| ^^^^^^^^^^^^^^^^^^
84+
LL | #![warn(clippy::filter_map)]
85+
| ^^^^^^^^^^^^^^^^^^
8686

8787
error: lint `clippy::pub_enum_variant_names` has been removed: set the `avoid-breaking-exported-api` config option to `false` to enable the `enum_variant_names` lint for public items
88-
--> $DIR/deprecated.rs:15:8
88+
--> $DIR/deprecated.rs:15:9
8989
|
90-
LL | #[warn(clippy::pub_enum_variant_names)]
91-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
90+
LL | #![warn(clippy::pub_enum_variant_names)]
91+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9292

9393
error: lint `clippy::wrong_pub_self_convention` has been removed: set the `avoid-breaking-exported-api` config option to `false` to enable the `wrong_self_convention` lint for public items
94-
--> $DIR/deprecated.rs:16:8
95-
|
96-
LL | #[warn(clippy::wrong_pub_self_convention)]
97-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
98-
99-
error: lint `clippy::invalid_atomic_ordering` has been renamed to `invalid_atomic_ordering`
100-
--> $DIR/deprecated.rs:17:8
94+
--> $DIR/deprecated.rs:16:9
10195
|
102-
LL | #[warn(clippy::invalid_atomic_ordering)]
103-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `invalid_atomic_ordering`
96+
LL | #![warn(clippy::wrong_pub_self_convention)]
97+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10498

105-
error: aborting due to 17 previous errors
99+
error: aborting due to 16 previous errors
106100

0 commit comments

Comments
 (0)