Skip to content

Don't lint on match pattern-binding in ´question_mark` #9348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clippy_lints/src/question_mark.rs
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ fn check_if_let_some_or_err_and_early_return<'tcx>(cx: &LateContext<'tcx>, expr:
if let Some(higher::IfLet { let_pat, let_expr, if_then, if_else }) = higher::IfLet::hir(cx, expr);
if !is_else_clause(cx.tcx, expr);
if let PatKind::TupleStruct(ref path1, [field], None) = let_pat.kind;
if let PatKind::Binding(annot, bind_id, ident, _) = field.kind;
if let PatKind::Binding(annot, bind_id, ident, None) = field.kind;
let caller_ty = cx.typeck_results().expr_ty(let_expr);
let if_block = IfBlockType::IfLet(path1, caller_ty, ident.name, let_expr, if_then, if_else);
if (is_early_return(sym::Option, cx, &if_block) && path_to_local_id(peel_blocks(if_then), bind_id))
15 changes: 15 additions & 0 deletions tests/ui/question_mark.fixed
Original file line number Diff line number Diff line change
@@ -207,4 +207,19 @@ fn option_map() -> Option<bool> {
}
}

pub struct PatternedError {
flag: bool,
}

// No warning
fn pattern() -> Result<(), PatternedError> {
let res = Ok(());

if let Err(err @ PatternedError { flag: true }) = res {
return Err(err);
}

res
}

fn main() {}
15 changes: 15 additions & 0 deletions tests/ui/question_mark.rs
Original file line number Diff line number Diff line change
@@ -243,4 +243,19 @@ fn option_map() -> Option<bool> {
}
}

pub struct PatternedError {
flag: bool,
}

// No warning
fn pattern() -> Result<(), PatternedError> {
let res = Ok(());

if let Err(err @ PatternedError { flag: true }) = res {
return Err(err);
}

res
}

fn main() {}