Fix a manual_unwrap_or FP with deref coercion

This commit is contained in:
Takayuki Nakata
2021-05-17 22:18:50 +09:00
parent 48dad265ab
commit ebf065e517
3 changed files with 19 additions and 0 deletions

View File

@@ -11,6 +11,7 @@ use rustc_hir::{Arm, Expr, ExprKind, PatKind};
use rustc_lint::LintContext; use rustc_lint::LintContext;
use rustc_lint::{LateContext, LateLintPass}; use rustc_lint::{LateContext, LateLintPass};
use rustc_middle::lint::in_external_macro; use rustc_middle::lint::in_external_macro;
use rustc_middle::ty::adjustment::Adjust;
use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::sym; use rustc_span::sym;
@@ -87,6 +88,8 @@ fn lint_manual_unwrap_or<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
if let PatKind::Binding(_, binding_hir_id, ..) = unwrap_pat.kind; if let PatKind::Binding(_, binding_hir_id, ..) = unwrap_pat.kind;
if path_to_local_id(unwrap_arm.body, binding_hir_id); if path_to_local_id(unwrap_arm.body, binding_hir_id);
if !contains_return_break_continue_macro(or_arm.body); if !contains_return_break_continue_macro(or_arm.body);
if !cx.typeck_results().expr_adjustments(unwrap_arm.body).iter()
.any(|a| matches!(a.kind, Adjust::Deref(Some(..))));
then { then {
Some(or_arm) Some(or_arm)
} else { } else {

View File

@@ -163,4 +163,12 @@ mod issue6965 {
} }
} }
use std::rc::Rc;
fn format_name(name: Option<&Rc<str>>) -> &str {
match name {
None => "<anon>",
Some(name) => name,
}
}
fn main() {} fn main() {}

View File

@@ -205,4 +205,12 @@ mod issue6965 {
} }
} }
use std::rc::Rc;
fn format_name(name: Option<&Rc<str>>) -> &str {
match name {
None => "<anon>",
Some(name) => name,
}
}
fn main() {} fn main() {}