Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix unsafe blocks

Browse source
This commit is contained in:
Yuri Astrakhan 2023-05-22 04:07:17 -04:00
parent 1c277d1be8
commit e926148188
3 changed files with 152 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clippy_utils/src/source.rs
View file

@ -4,7 +4,7 @@
use rustc_data_structures::sync::Lrc;
use rustc_errors::Applicability;
use rustc_hir::{Expr, ExprKind};
use rustc_hir::{BlockCheckMode, Expr, ExprKind, UnsafeSource};
use rustc_lint::{LateContext, LintContext};
use rustc_session::Session;
use rustc_span::source_map::{original_sp, SourceMap};
@ -71,11 +71,17 @@ pub fn expr_block<T: LintContext>(
app: &mut Applicability,
) -> String {
let (code, from_macro) = snippet_block_with_context(cx, expr.span, outer, default, indent_relative_to, app);
if from_macro {
format!("{{ {code} }}")
} else if let ExprKind::Block(_, _) = expr.kind {
if !from_macro &&
let ExprKind::Block(block, _) = expr.kind &&
// TODO: Is this enough UnsafeSource::UserProvided, or should CompilerGenerated be also included?
block.rules != BlockCheckMode::UnsafeBlock(UnsafeSource::UserProvided)
{
format!("{code}")
} else {
// FIXME: add extra indent for the unsafe blocks:
// original code: unsafe { ... }
// result code: { unsafe { ... } }
// desired code: {\n unsafe { ... }\n}
format!("{{ {code} }}")
}
}

45
tests/ui/single_match.stderr
View file

@ -155,5 +155,48 @@ LL | | (..) => {},
LL | | }
| |_____^ help: try this: `if let (.., Some(E::V), _) = (Some(42), Some(E::V), Some(42)) {}`
error: aborting due to 16 previous errors
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match.rs:249:5
|
LL | / match bar {
LL | | Some(v) => unsafe {
LL | | let r = &v as *const i32;
LL | | println!("{}", *r);
LL | | },
LL | | _ => {},
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar { unsafe {
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + } }
|
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match.rs:257:5
|
LL | / match bar {
LL | | Some(v) => {
LL | | // this comment prevents rustfmt from collapsing the block
LL | | unsafe {
... |
LL | | _ => {},
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar {
LL + // this comment prevents rustfmt from collapsing the block
LL + unsafe {
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + }
LL + }
|
error: aborting due to 18 previous errors

99
tests/ui/single_match_else.stderr
View file

@ -100,5 +100,102 @@ LL + return;
LL + }
|
error: aborting due to 5 previous errors
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match_else.rs:120:5
|
LL | / match bar {
LL | | Some(v) => unsafe {
LL | | let r = &v as *const i32;
LL | | println!("{}", *r);
... |
LL | | },
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar { unsafe {
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + } } else {
LL + println!("None1");
LL + println!("None2");
LL + }
|
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match_else.rs:131:5
|
LL | / match bar {
LL | | Some(v) => {
LL | | println!("Some");
LL | | println!("{v}");
... |
LL | | },
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar {
LL + println!("Some");
LL + println!("{v}");
LL + } else { unsafe {
LL + let v = 0;
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + } }
|
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match_else.rs:143:5
|
LL | / match bar {
LL | | Some(v) => unsafe {
LL | | let r = &v as *const i32;
LL | | println!("{}", *r);
... |
LL | | },
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar { unsafe {
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + } } else { unsafe {
LL + let v = 0;
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + } }
|
error: you seem to be trying to use `match` for destructuring a single pattern. Consider using `if let`
--> $DIR/single_match_else.rs:155:5
|
LL | / match bar {
LL | | Some(v) => {
LL | | // this comment prevents rustfmt from collapsing the block
LL | | unsafe {
... |
LL | | },
LL | | }
| |_____^
|
help: try this
|
LL ~ if let Some(v) = bar {
LL + // this comment prevents rustfmt from collapsing the block
LL + unsafe {
LL + let r = &v as *const i32;
LL + println!("{}", *r);
LL + }
LL + } else {
LL + println!("None");
LL + println!("None");
LL + }
|
error: aborting due to 9 previous errors