Rollup merge of #79812 - Aaron1011:lint-item-trailing-semi, r=oli-obk
Lint on redundant trailing semicolon after item
We now lint on code like this:
```rust
fn main() {
fn foo() {};
struct Bar {};
}
```
Previously, this caused warnings in Cargo, so it was disabled.
This commit is contained in:
commit
3fe423663b
8 changed files with 32 additions and 30 deletions
|
|
@ -558,12 +558,12 @@ crate fn make_test(
|
|||
"fn main() {{ {}fn {}() -> Result<(), impl core::fmt::Debug> {{\n",
|
||||
inner_attr, inner_fn_name
|
||||
),
|
||||
format!("\n}}; {}().unwrap() }}", inner_fn_name),
|
||||
format!("\n}} {}().unwrap() }}", inner_fn_name),
|
||||
)
|
||||
} else if test_id.is_some() {
|
||||
(
|
||||
format!("fn main() {{ {}fn {}() {{\n", inner_attr, inner_fn_name),
|
||||
format!("\n}}; {}() }}", inner_fn_name),
|
||||
format!("\n}} {}() }}", inner_fn_name),
|
||||
)
|
||||
} else {
|
||||
("fn main() {\n".into(), "\n}".into())
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ use std::io;
|
|||
let mut input = String::new();
|
||||
io::stdin().read_line(&mut input)?;
|
||||
Ok::<(), io:Error>(())
|
||||
}; _inner().unwrap() }"
|
||||
} _inner().unwrap() }"
|
||||
.to_string();
|
||||
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION, None);
|
||||
assert_eq!((output, len), (expected, 2));
|
||||
|
|
@ -306,7 +306,7 @@ fn make_test_named_wrapper() {
|
|||
let expected = "#![allow(unused)]
|
||||
fn main() { #[allow(non_snake_case)] fn _doctest_main__some_unique_name() {
|
||||
assert_eq!(2+2, 4);
|
||||
}; _doctest_main__some_unique_name() }"
|
||||
} _doctest_main__some_unique_name() }"
|
||||
.to_string();
|
||||
let (output, len, _) =
|
||||
make_test(input, None, false, &opts, DEFAULT_EDITION, Some("_some_unique_name"));
|
||||
|
|
|
|||
|
|
@ -1027,7 +1027,7 @@ fn markdown_summary_with_limit(md: &str, length_limit: usize) -> (String, bool)
|
|||
fn push(s: &mut String, text_length: &mut usize, text: &str) {
|
||||
s.push_str(text);
|
||||
*text_length += text.len();
|
||||
};
|
||||
}
|
||||
|
||||
'outer: for event in Parser::new_ext(md, summary_opts()) {
|
||||
match &event {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
// check-pass
|
||||
// This test should stop compiling
|
||||
// we decide to enable this lint for item statements.
|
||||
|
||||
#![deny(redundant_semicolons)]
|
||||
|
||||
fn main() {
|
||||
fn inner() {};
|
||||
struct Bar {};
|
||||
fn inner() {}; //~ ERROR unnecessary
|
||||
struct Bar {}; //~ ERROR unnecessary
|
||||
}
|
||||
|
|
|
|||
20
src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr
Normal file
20
src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
error: unnecessary trailing semicolon
|
||||
--> $DIR/item-stmt-semi.rs:4:18
|
||||
|
|
||||
LL | fn inner() {};
|
||||
| ^ help: remove this semicolon
|
||||
|
|
||||
note: the lint level is defined here
|
||||
--> $DIR/item-stmt-semi.rs:1:9
|
||||
|
|
||||
LL | #![deny(redundant_semicolons)]
|
||||
| ^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: unnecessary trailing semicolon
|
||||
--> $DIR/item-stmt-semi.rs:5:18
|
||||
|
|
||||
LL | struct Bar {};
|
||||
| ^ help: remove this semicolon
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ fn main() {
|
|||
B(i32),
|
||||
C,
|
||||
D,
|
||||
};
|
||||
}
|
||||
let x = E::A(2);
|
||||
{
|
||||
// lint
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ fn main() {
|
|||
B(i32),
|
||||
C,
|
||||
D,
|
||||
};
|
||||
}
|
||||
let x = E::A(2);
|
||||
{
|
||||
// lint
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue