-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #11083 - sylvestre:autofix, r=dswij
[`semicolon_if_nothing_returned`]: add an autofix changelog: [`semicolon_if_nothing_returned`]: add an autofix
- Loading branch information
Showing
4 changed files
with
131 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,123 @@ | ||
//@run-rustfix | ||
#![warn(clippy::semicolon_if_nothing_returned)] | ||
#![allow(clippy::redundant_closure, clippy::uninlined_format_args, clippy::needless_late_init)] | ||
|
||
fn get_unit() {} | ||
|
||
// the functions below trigger the lint | ||
fn main() { | ||
println!("Hello"); | ||
} | ||
|
||
fn hello() { | ||
get_unit(); | ||
} | ||
|
||
fn basic101(x: i32) { | ||
let y: i32; | ||
y = x + 1; | ||
} | ||
|
||
#[rustfmt::skip] | ||
fn closure_error() { | ||
let _d = || { | ||
hello(); | ||
}; | ||
} | ||
|
||
#[rustfmt::skip] | ||
fn unsafe_checks_error() { | ||
use std::mem::MaybeUninit; | ||
use std::ptr; | ||
|
||
let mut s = MaybeUninit::<String>::uninit(); | ||
let _d = || unsafe { | ||
ptr::drop_in_place(s.as_mut_ptr()); | ||
}; | ||
} | ||
|
||
// this is fine | ||
fn print_sum(a: i32, b: i32) { | ||
println!("{}", a + b); | ||
assert_eq!(true, false); | ||
} | ||
|
||
fn foo(x: i32) { | ||
let y: i32; | ||
if x < 1 { | ||
y = 4; | ||
} else { | ||
y = 5; | ||
} | ||
} | ||
|
||
fn bar(x: i32) { | ||
let y: i32; | ||
match x { | ||
1 => y = 4, | ||
_ => y = 32, | ||
} | ||
} | ||
|
||
fn foobar(x: i32) { | ||
let y: i32; | ||
'label: { | ||
y = x + 1; | ||
} | ||
} | ||
|
||
fn loop_test(x: i32) { | ||
let y: i32; | ||
for &ext in &["stdout", "stderr", "fixed"] { | ||
println!("{}", ext); | ||
} | ||
} | ||
|
||
fn closure() { | ||
let _d = || hello(); | ||
} | ||
|
||
#[rustfmt::skip] | ||
fn closure_block() { | ||
let _d = || { hello() }; | ||
} | ||
|
||
unsafe fn some_unsafe_op() {} | ||
unsafe fn some_other_unsafe_fn() {} | ||
|
||
fn do_something() { | ||
unsafe { some_unsafe_op() }; | ||
|
||
unsafe { some_other_unsafe_fn() }; | ||
} | ||
|
||
fn unsafe_checks() { | ||
use std::mem::MaybeUninit; | ||
use std::ptr; | ||
|
||
let mut s = MaybeUninit::<String>::uninit(); | ||
let _d = || unsafe { ptr::drop_in_place(s.as_mut_ptr()) }; | ||
} | ||
|
||
// Issue #7768 | ||
#[rustfmt::skip] | ||
fn macro_with_semicolon() { | ||
macro_rules! repro { | ||
() => { | ||
while false { | ||
} | ||
}; | ||
} | ||
repro!(); | ||
} | ||
|
||
fn function_returning_option() -> Option<i32> { | ||
Some(1) | ||
} | ||
|
||
// No warning | ||
fn let_else_stmts() { | ||
let Some(x) = function_returning_option() else { | ||
return; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters