Commit 0857a8e

committed

Auto merge of #134464 - Veykril:backport/rust-analyzer/18711, r=Mark-Simulacrum

2 parents 202008a + 840f658 commit 0857a8eCopy full SHA for 0857a8e

File tree

+27

-4

lines changed

src/tools/rust-analyzer/crates
- hir-ty/src/diagnostics
  - unsafe_check.rs
- ide-diagnostics/src/handlers
  - missing_unsafe.rs

+27

-4

lines changed

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,18 @@ fn walk_unsafe(`
`99`	`99`	`}`
`100`	`100`	`Expr::Path(path) => mark_unsafe_path(path, current.into()),`
`101`	`101`	`Expr::Ref { expr, rawness: Rawness::RawPtr, mutability: _ } => {`
`102`		`- if let Expr::Path(_) = body.exprs[*expr] {`
`103`		- // Do not report unsafe for `addr_of[_mut]!(EXTERN_OR_MUT_STATIC)`,
`104`		`- // see https://github.com/rust-lang/rust/pull/125834.`
`105`		`- return;`
	`102`	`+ match body.exprs[*expr] {`
	`103`	`+ Expr::Path(_) => return,`
	`104`	`+ // https://github.com/rust-lang/rust/pull/129248`
	`105`	`+ // Taking a raw ref to a deref place expr is always safe.`
	`106`	`+ Expr::UnaryOp { expr, op: UnaryOp::Deref } => {`
	`107`	`+ body.walk_child_exprs(expr, \|child\| {`
	`108`	`+ walk_unsafe(db, infer, body, resolver, def, child, inside_unsafe_block, unsafe_expr_cb);`
	`109`	`+ });`
	`110`	`+`
	`111`	`+ return;`
	`112`	`+ }`
	`113`	`+ _ => (),`
`106`	`114`	`}`
`107`	`115`	`}`
`108`	`116`	`Expr::MethodCall { .. } => {`

Lines changed: 15 additions & 0 deletions

Comments

(0)