diff options
| author | Quinn Sinclair <me@partiallytyped.dev> | 2024-03-24 11:00:09 +0100 |
|---|---|---|
| committer | Quinn Sinclair <me@partiallytyped.dev> | 2024-03-24 11:00:09 +0100 |
| commit | 94fe2fac633e4a17f9ba63ee74689beae62d24b6 (patch) | |
| tree | ab8e707f5bb20aad1c6ecf5bfe3532df1e00e1aa | |
| parent | 660b058ba250e4f32ef165aaf8f61479da5dbb87 (diff) | |
| download | rust-94fe2fac633e4a17f9ba63ee74689beae62d24b6.tar.gz rust-94fe2fac633e4a17f9ba63ee74689beae62d24b6.zip | |
Remove `unwrap` from `match_trait_method`
Unused_IO_amount relies on `match_trait_method` in order to match trait methods that exist in Tokio traits as the corresponding symbols don't exist. With this commit we remove the unwrap that may have caused 12366. Note: author (@m-rph) and @GuillaumeGomez couldn't replicate 12366.
| -rw-r--r-- | clippy_utils/src/lib.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs index b013e4196ea..c5782ca521d 100644 --- a/clippy_utils/src/lib.rs +++ b/clippy_utils/src/lib.rs @@ -298,9 +298,10 @@ pub fn is_ty_alias(qpath: &QPath<'_>) -> bool { /// Checks if the method call given in `expr` belongs to the given trait. /// This is a deprecated function, consider using [`is_trait_method`]. pub fn match_trait_method(cx: &LateContext<'_>, expr: &Expr<'_>, path: &[&str]) -> bool { - let def_id = cx.typeck_results().type_dependent_def_id(expr.hir_id).unwrap(); - let trt_id = cx.tcx.trait_of_item(def_id); - trt_id.map_or(false, |trt_id| match_def_path(cx, trt_id, path)) + cx.typeck_results() + .type_dependent_def_id(expr.hir_id) + .and_then(|defid| cx.tcx.trait_of_item(defid)) + .map_or(false, |trt_id| match_def_path(cx, trt_id, path)) } /// Checks if a method is defined in an impl of a diagnostic item |
