Skip to content

Commit dae6868

Browse files
borsbors
committed
Auto merge of #45424 - petrochenkov:grlint, r=oli-obk
Add several lints into `unused` lint group Also a couple of obsolete (not reported) lints are removed. r? @oli-obk
2 parents 90ef337 + bf0cdb5 commit dae6868

22 files changed

+53
-55
lines changed

‎src/librustc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#![feature(core_intrinsics)]
4848
#![feature(i128_type)]
4949
#![cfg_attr(windows, feature(libc))]
50+
#![feature(macro_vis_matcher)]
5051
#![feature(never_type)]
5152
#![feature(nonzero)]
5253
#![feature(quote)]

‎src/librustc/lint/builtin.rs

-7
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ declare_lint! {
106106
"unknown crate type found in #[crate_type] directive"
107107
}
108108

109-
declare_lint! {
110-
pub FAT_PTR_TRANSMUTES,
111-
Allow,
112-
"detects transmutes of fat pointers"
113-
}
114-
115109
declare_lint! {
116110
pub TRIVIAL_CASTS,
117111
Allow,
@@ -250,7 +244,6 @@ impl LintPass for HardwiredLints {
250244
UNUSED_FEATURES,
251245
STABLE_FEATURES,
252246
UNKNOWN_CRATE_TYPES,
253-
FAT_PTR_TRANSMUTES,
254247
TRIVIAL_CASTS,
255248
TRIVIAL_NUMERIC_CASTS,
256249
PRIVATE_IN_PUBLIC,

‎src/librustc/lint/mod.rs

+7-20
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,16 @@ impl Lint {
8484
}
8585
}
8686

87-
/// Build a `Lint` initializer.
88-
#[macro_export]
89-
macro_rules! lint_initializer {
90-
($name:ident, $level:ident, $desc:expr) => (
91-
::rustc::lint::Lint {
92-
name: stringify!($name),
93-
default_level: ::rustc::lint::$level,
94-
desc: $desc,
95-
}
96-
)
97-
}
98-
9987
/// Declare a static item of type `&'static Lint`.
10088
#[macro_export]
10189
macro_rules! declare_lint {
102-
(pub $name:ident, $level:ident, $desc:expr) => (
103-
pub static $name: &'static ::rustc::lint::Lint
104-
= &lint_initializer!($name, $level, $desc);
105-
);
106-
($name:ident, $level:ident, $desc:expr) => (
107-
static $name: &'static ::rustc::lint::Lint
108-
= &lint_initializer!($name, $level, $desc);
109-
);
90+
($vis: vis $NAME: ident, $Level: ident, $desc: expr) => (
91+
$vis static $NAME: &$crate::lint::Lint = &$crate::lint::Lint {
92+
name: stringify!($NAME),
93+
default_level: $crate::lint::$Level,
94+
desc: $desc
95+
};
96+
)
11097
}
11198

11299
/// Declare a static `LintArray` and return it as an expression.

‎src/librustc_lint/builtin.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -621,12 +621,6 @@ impl EarlyLintPass for AnonymousParameters {
621621
}
622622
}
623623

624-
declare_lint! {
625-
DEPRECATED_ATTR,
626-
Warn,
627-
"detects use of deprecated attributes"
628-
}
629-
630624
/// Checks for use of attributes which have been deprecated.
631625
#[derive(Clone)]
632626
pub struct DeprecatedAttr {
@@ -645,7 +639,7 @@ impl DeprecatedAttr {
645639

646640
impl LintPass for DeprecatedAttr {
647641
fn get_lints(&self) -> LintArray {
648-
lint_array!(DEPRECATED_ATTR)
642+
lint_array!()
649643
}
650644
}
651645

‎src/librustc_lint/lib.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#![feature(box_patterns)]
2929
#![feature(box_syntax)]
3030
#![feature(i128_type)]
31+
#![feature(macro_vis_matcher)]
3132
#![feature(quote)]
3233
#![feature(rustc_diagnostic_macros)]
3334
#![feature(slice_patterns)]
@@ -163,7 +164,12 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
163164
UNUSED_UNSAFE,
164165
PATH_STATEMENTS,
165166
UNUSED_ATTRIBUTES,
166-
UNUSED_MACROS);
167+
UNUSED_MACROS,
168+
UNUSED_ALLOCATION,
169+
UNUSED_DOC_COMMENT,
170+
UNUSED_EXTERN_CRATES,
171+
UNUSED_FEATURES,
172+
UNUSED_PARENS);
167173

168174
// Guidelines for creating a future incompatibility lint:
169175
//
@@ -239,15 +245,15 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
239245

240246
// Register renamed and removed lints
241247
store.register_renamed("unknown_features", "unused_features");
242-
store.register_removed("unsigned_negation",
243-
"replaced by negate_unsigned feature gate");
248+
store.register_removed("unsigned_negation", "replaced by negate_unsigned feature gate");
244249
store.register_removed("negate_unsigned", "cast a signed value instead");
245250
store.register_removed("raw_pointer_derive", "using derive with raw pointers is ok");
246251
// This was renamed to raw_pointer_derive, which was then removed,
247252
// so it is also considered removed
248-
store.register_removed("raw_pointer_deriving",
249-
"using derive with raw pointers is ok");
253+
store.register_removed("raw_pointer_deriving", "using derive with raw pointers is ok");
250254
store.register_removed("drop_with_repr_extern", "drop flags have been removed");
255+
store.register_removed("fat_ptr_transmutes", "was accidentally removed back in 2014");
256+
store.register_removed("deprecated_attr", "use `deprecated` instead");
251257
store.register_removed("transmute_from_fn_item_types",
252258
"always cast functions before transmuting them");
253259
store.register_removed("hr_lifetime_in_assoc_type",

‎src/librustc_lint/unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedAttributes {
225225
}
226226

227227
declare_lint! {
228-
UNUSED_PARENS,
228+
pub(super) UNUSED_PARENS,
229229
Warn,
230230
"`if`, `match`, `while` and `return` do not need parentheses"
231231
}
@@ -350,7 +350,7 @@ impl EarlyLintPass for UnusedImportBraces {
350350
}
351351

352352
declare_lint! {
353-
UNUSED_ALLOCATION,
353+
pub(super) UNUSED_ALLOCATION,
354354
Warn,
355355
"detects unnecessary allocations that can be eliminated"
356356
}

‎src/librustc_passes/consts.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ impl<'a, 'gcx> CheckCrateVisitor<'a, 'gcx> {
140140
self.tcx.lint_node(CONST_ERR,
141141
expr.id,
142142
expr.span,
143-
&format!("constant evaluation error: {}. This will \
144-
become a HARD ERROR in the future",
143+
&format!("constant evaluation error: {}",
145144
err.description().into_oneline()));
146145
}
147146
}

‎src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar, rustc_private)]
1414
#![feature(box_syntax)]
15+
#![feature(macro_vis_matcher)]
1516

1617
#[macro_use] extern crate rustc;
1718
extern crate rustc_plugin;

‎src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
// Load rustc as a plugin to get macros
1718
#[macro_use]

‎src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
extern crate syntax;
1718

‎src/test/compile-fail/const-eval-overflow.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const VALS_I64: (i64, i64, i64, i64) =
8282
);
8383

8484
const VALS_U8: (u8, u8, u8, u8) =
85-
( //~ WARN constant evaluation error: attempt to subtract with overflow.
85+
( //~ WARN constant evaluation error: attempt to subtract with overflow
8686
-(u8::MIN as i8) as u8,
8787
u8::MIN - 1,
8888
//~^ ERROR constant evaluation error
@@ -96,7 +96,7 @@ const VALS_U8: (u8, u8, u8, u8) =
9696
);
9797

9898
const VALS_U16: (u16, u16, u16, u16) =
99-
( //~ WARN constant evaluation error: attempt to subtract with overflow.
99+
( //~ WARN constant evaluation error: attempt to subtract with overflow
100100
-(u16::MIN as i16) as u16,
101101
u16::MIN - 1,
102102
//~^ ERROR constant evaluation error
@@ -110,7 +110,7 @@ const VALS_U16: (u16, u16, u16, u16) =
110110
);
111111

112112
const VALS_U32: (u32, u32, u32, u32) =
113-
( //~ WARN constant evaluation error: attempt to subtract with overflow.
113+
( //~ WARN constant evaluation error: attempt to subtract with overflow
114114
-(u32::MIN as i32) as u32,
115115
u32::MIN - 1,
116116
//~^ ERROR constant evaluation error
@@ -124,7 +124,7 @@ const VALS_U32: (u32, u32, u32, u32) =
124124
);
125125

126126
const VALS_U64: (u64, u64, u64, u64) =
127-
( //~ WARN constant evaluation error: attempt to subtract with overflow.
127+
( //~ WARN constant evaluation error: attempt to subtract with overflow
128128
-(u64::MIN as i64) as u64,
129129
u64::MIN - 1,
130130
//~^ ERROR constant evaluation error

‎src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar, rustc_private)]
1414
#![feature(box_syntax)]
15+
#![feature(macro_vis_matcher)]
1516

1617
#[macro_use] extern crate rustc;
1718
extern crate rustc_plugin;

‎src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010
#![feature(box_syntax, plugin, plugin_registrar, rustc_private)]
11+
#![feature(macro_vis_matcher)]
1112
#![crate_type = "dylib"]
1213

1314
#[macro_use]

‎src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
// Load rustc as a plugin to get macros
1718
#[macro_use]

‎src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
extern crate syntax;
1718

‎src/test/ui/const-eval/issue-43197.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
warning: constant evaluation error: attempt to subtract with overflow. This will become a HARD ERROR in the future
1+
warning: constant evaluation error: attempt to subtract with overflow
22
--> $DIR/issue-43197.rs:18:20
33
|
44
18 | const X: u32 = 0-1;
55
| ^^^
66
|
77
= note: #[warn(const_err)] on by default
88

9-
warning: constant evaluation error: attempt to subtract with overflow. This will become a HARD ERROR in the future
9+
warning: constant evaluation error: attempt to subtract with overflow
1010
--> $DIR/issue-43197.rs:19:20
1111
|
1212
19 | const Y: u32 = foo(0-1);

‎src/test/ui/lint/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![warn(unused_mut)] // UI tests pass `-A unused`—see Issue #43896
11+
#![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
1212
#![feature(no_debug)]
1313

1414
#[no_mangle] static SHENZHOU: usize = 1; // should suggest `pub`

‎src/test/ui/lint/suggestions.stderr

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ warning: unnecessary parentheses around assigned value
44
30 | let mut a = (1); // should suggest no `mut`, no parens
55
| ^^^ help: remove these parentheses
66
|
7-
= note: #[warn(unused_parens)] on by default
7+
note: lint level defined here
8+
--> $DIR/suggestions.rs:11:21
9+
|
10+
11 | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
11+
| ^^^^^^^^^^^^^
812

913
warning: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand. See https://github.com/rust-lang/rust/issues/29721
1014
--> $DIR/suggestions.rs:27:1
@@ -25,7 +29,7 @@ warning: variable does not need to be mutable
2529
note: lint level defined here
2630
--> $DIR/suggestions.rs:11:9
2731
|
28-
11 | #![warn(unused_mut)] // UI tests pass `-A unused`—see Issue #43896
32+
11 | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
2933
| ^^^^^^^^^^
3034

3135
warning: static is marked #[no_mangle], but not exported

‎src/test/ui/lint/unused_parens_json_suggestion.rs

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
// stripping away any starting or ending parenthesis characters—hence this
1717
// test of the JSON error format.
1818

19+
#![warn(unused_parens)]
20+
1921
fn main() {
2022
// We want to suggest the properly-balanced expression `1 / (2 + 3)`, not
2123
// the malformed `1 / (2 + 3`

‎src/test/ui/lint/unused_parens_json_suggestion.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"message":"unnecessary parentheses around assigned value","code":null,"level":"warning","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[{"message":"#[warn(unused_parens)] on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":"1 / (2 + 3)","expansion":null}],"children":[],"rendered":null}],"rendered":null}
1+
{"message":"unnecessary parentheses around assigned value","code":null,"level":"warning","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":1001,"byte_end":1014,"line_start":24,"line_end":24,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[{"message":"lint level defined here","code":null,"level":"note","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":847,"byte_end":860,"line_start":19,"line_end":19,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":"#![warn(unused_parens)]","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[],"rendered":null},{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":1001,"byte_end":1014,"line_start":24,"line_end":24,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":"1 / (2 + 3)","expansion":null}],"children":[],"rendered":null}],"rendered":null}

‎src/test/ui/path-lookahead.stderr

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ warning: unnecessary parentheses around `return` value
44
18 | return (<T as ToString>::to_string(&arg)); //~WARN unnecessary parentheses around `return` value
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses
66
|
7-
= note: #[warn(unused_parens)] on by default
7+
note: lint level defined here
8+
--> $DIR/path-lookahead.rs:13:9
9+
|
10+
13 | #![warn(unused)]
11+
| ^^^^^^
12+
= note: #[warn(unused_parens)] implied by #[warn(unused)]
813

914
warning: function is never used: `with_parens`
1015
--> $DIR/path-lookahead.rs:17:1

‎src/tools/toolstate.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
miri = "Broken"
2727

2828
# ping @Manishearth @llogiq @mcarton @oli-obk
29-
clippy = "Compiling"
29+
clippy = "Broken"
3030

3131
# ping @nrc
3232
rls = "Testing"

0 commit comments

Comments
 (0)