Fix ICE on None.unwrap_or_default()

rust-lang · bors · Aug 1, 2023 · Jun 14, 2023 · Jul 12, 2023 · Jul 13, 2023
commit c2aaa622eb1b8ce390dc5766199ed7c63d4900d7
diff --git a/clippy_lints/src/methods/unnecessary_literal_unwrap.rs b/clippy_lints/src/methods/unnecessary_literal_unwrap.rs
@@ -3,6 3,8 @@ use clippy_utils::{is_res_lang_ctor, last_path_segment, path_res, MaybePath};
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_lint::LateContext;
 use rustc_middle::ty;
 use rustc_middle::ty::print::with_forced_trimmed_paths;
 
 use super::UNNECESSARY_LITERAL_UNWRAP;
 
@@ -84,6 86,16 @@ pub(super) fn check(
  }
  Some(suggs)
  },
  ("None", "unwrap_or_default", _) => {
  let ty = cx.typeck_results().expr_ty(expr);
  let default_ty_string = if let ty::Adt(def, ..) = ty.kind() {
  with_forced_trimmed_paths!(format!("{}", cx.tcx.def_path_str(def.did())))
  } else {
  "Default".to_string()
  };
  Some(vec![(expr.span, format!("{default_ty_string}::default()"))])
  },
  _ if call_args.is_empty() => None,
  (_, _, Some(_)) => None,
  ("Ok", "unwrap_err", None) | ("Err", "unwrap", None) => Some(vec![
  (

diff --git a/tests/ui/unnecessary_literal_unwrap.fixed b/tests/ui/unnecessary_literal_unwrap.fixed
@@ -19,9 19,11 @@ fn unwrap_option_some() {
 fn unwrap_option_none() {
  let _val = panic!();
  let _val = panic!("this always happens");
  let _val: String = String::default();
 
  panic!();
  panic!("this always happens");
  String::default();
 }
 
 fn unwrap_result_ok() {

diff --git a/tests/ui/unnecessary_literal_unwrap.rs b/tests/ui/unnecessary_literal_unwrap.rs
@@ -19,9 19,11 @@ fn unwrap_option_some() {
 fn unwrap_option_none() {
  let _val = None::<()>.unwrap();
  let _val = None::<()>.expect("this always happens");
  let _val: String = None.unwrap_or_default();
 
  None::<()>.unwrap();
  None::<()>.expect("this always happens");
  None::<String>.unwrap_or_default();
 }
 
 fn unwrap_result_ok() {