diff options
| -rw-r--r-- | clippy_utils/src/ty/type_certainty/mod.rs | 9 | ||||
| -rw-r--r-- | tests/ui/unwrap_or_else_default.fixed | 4 | ||||
| -rw-r--r-- | tests/ui/unwrap_or_else_default.rs | 4 | ||||
| -rw-r--r-- | tests/ui/unwrap_or_else_default.stderr | 10 |
4 files changed, 23 insertions, 4 deletions
diff --git a/clippy_utils/src/ty/type_certainty/mod.rs b/clippy_utils/src/ty/type_certainty/mod.rs index 67c4a293a86..45b5483e323 100644 --- a/clippy_utils/src/ty/type_certainty/mod.rs +++ b/clippy_utils/src/ty/type_certainty/mod.rs @@ -12,7 +12,7 @@ //! be considered a bug. use crate::def_path_res; -use rustc_hir::def::Res; +use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::DefId; use rustc_hir::intravisit::{walk_qpath, walk_ty, Visitor}; use rustc_hir::{self as hir, Expr, ExprKind, GenericArgs, HirId, Node, PathSegment, QPath, TyKind}; @@ -219,7 +219,12 @@ fn path_segment_certainty( // See the comment preceding `qpath_certainty`. `def_id` could refer to a type or a value. let certainty = lhs.join_clearing_def_ids(rhs); if resolves_to_type { - certainty.with_def_id(def_id) + if cx.tcx.def_kind(def_id) == DefKind::TyAlias { + adt_def_id(cx.tcx.type_of(def_id).instantiate_identity()) + .map_or(certainty, |def_id| certainty.with_def_id(def_id)) + } else { + certainty.with_def_id(def_id) + } } else { certainty } diff --git a/tests/ui/unwrap_or_else_default.fixed b/tests/ui/unwrap_or_else_default.fixed index 89a6b1395e5..acdb96942ba 100644 --- a/tests/ui/unwrap_or_else_default.fixed +++ b/tests/ui/unwrap_or_else_default.fixed @@ -109,6 +109,10 @@ fn type_certainty(option: Option<Vec<u64>>) { // should not be changed: no type annotation, unconcretized initializer let option = None; option.unwrap_or_else(Vec::new).push(1); + + type Alias = Option<Vec<u32>>; + let option: Alias = Option::<Vec<u32>>::Some(Vec::new()); + option.unwrap_or_default().push(1); } fn method_call_with_deref() { diff --git a/tests/ui/unwrap_or_else_default.rs b/tests/ui/unwrap_or_else_default.rs index e5ebf35adda..55ccd00e1a2 100644 --- a/tests/ui/unwrap_or_else_default.rs +++ b/tests/ui/unwrap_or_else_default.rs @@ -109,6 +109,10 @@ fn type_certainty(option: Option<Vec<u64>>) { // should not be changed: no type annotation, unconcretized initializer let option = None; option.unwrap_or_else(Vec::new).push(1); + + type Alias = Option<Vec<u32>>; + let option: Alias = Option::<Vec<u32>>::Some(Vec::new()); + option.unwrap_or_else(Vec::new).push(1); } fn method_call_with_deref() { diff --git a/tests/ui/unwrap_or_else_default.stderr b/tests/ui/unwrap_or_else_default.stderr index 91e48375f18..af662c6def7 100644 --- a/tests/ui/unwrap_or_else_default.stderr +++ b/tests/ui/unwrap_or_else_default.stderr @@ -84,11 +84,17 @@ error: use of `unwrap_or_else` to construct default value LL | option.unwrap_or_else(Vec::new).push(1); | ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()` +error: use of `unwrap_or_else` to construct default value + --> $DIR/unwrap_or_else_default.rs:115:12 + | +LL | option.unwrap_or_else(Vec::new).push(1); + | ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()` + error: use of `or_insert_with` to construct default value - --> $DIR/unwrap_or_else_default.rs:128:32 + --> $DIR/unwrap_or_else_default.rs:132:32 | LL | let _ = inner_map.entry(0).or_insert_with(Default::default); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()` -error: aborting due to 15 previous errors +error: aborting due to 16 previous errors |