Skip to content

Commit b8c16e4

Browse files
committed
fix: option_if_let_else keep deref op if the inner expr is a raw pointer
closes rust-clippy/issues/15379 Signed-off-by: Zihan <[email protected]>
1 parent e8185ec commit b8c16e4

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

clippy_lints/src/option_if_let_else.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ fn try_get_option_occurrence<'tcx>(
127127
if_else: &'tcx Expr<'_>,
128128
) -> Option<OptionOccurrence> {
129129
let cond_expr = match expr.kind {
130-
ExprKind::Unary(UnOp::Deref, inner_expr) | ExprKind::AddrOf(_, _, inner_expr) => inner_expr,
130+
ExprKind::AddrOf(_, _, inner_expr) => inner_expr,
131+
ExprKind::Unary(UnOp::Deref, inner_expr) if !cx.typeck_results().expr_ty(inner_expr).is_raw_ptr() => inner_expr,
131132
_ => expr,
132133
};
133134
let (inner_pat, is_result) = try_get_inner_pat_and_is_result(cx, pat)?;

tests/ui/option_if_let_else.fixed

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,3 +302,10 @@ mod issue11059 {
302302
if let Some(o) = o { o } else { &S }
303303
}
304304
}
305+
306+
fn issue15379() {
307+
let opt = Some(0usize);
308+
let opt_raw_ptr = &opt as *const Option<usize>;
309+
let _ = unsafe { (*opt_raw_ptr).map_or(1, |o| o) };
310+
//~^ option_if_let_else
311+
}

tests/ui/option_if_let_else.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,3 +365,10 @@ mod issue11059 {
365365
if let Some(o) = o { o } else { &S }
366366
}
367367
}
368+
369+
fn issue15379() {
370+
let opt = Some(0usize);
371+
let opt_raw_ptr = &opt as *const Option<usize>;
372+
let _ = unsafe { if let Some(o) = *opt_raw_ptr { o } else { 1 } };
373+
//~^ option_if_let_else
374+
}

tests/ui/option_if_let_else.stderr

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,5 +334,11 @@ error: use Option::map_or_else instead of an if let/else
334334
LL | let mut _hm = if let Some(hm) = &opt { hm.clone() } else { new_map!() };
335335
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `opt.as_ref().map_or_else(|| new_map!(), |hm| hm.clone())`
336336

337-
error: aborting due to 25 previous errors
337+
error: use Option::map_or instead of an if let/else
338+
--> tests/ui/option_if_let_else.rs:372:22
339+
|
340+
LL | let _ = unsafe { if let Some(o) = *opt_raw_ptr { o } else { 1 } };
341+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `(*opt_raw_ptr).map_or(1, |o| o)`
342+
343+
error: aborting due to 26 previous errors
338344

0 commit comments

Comments
 (0)