Fix ICE on None.unwrap_or_default()

syvb · syvb · commit 639c9a2e6eeb · 2023-07-07T10:12:37.000-04:00
diff --git a/clippy_lints/src/methods/unnecessary_literal_unwrap.rs b/clippy_lints/src/methods/unnecessary_literal_unwrap.rs
@@ -2,6 +2,7 @@ use clippy_utils::{diagnostics::span_lint_and_then, is_res_lang_ctor, last_path_
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_lint::LateContext;
+use rustc_middle::ty::{self, print::with_forced_trimmed_paths};
 
 use super::UNNECESSARY_LITERAL_UNWRAP;
 
@@ -62,6 +63,16 @@ pub(super) fn check(
                 (expr.span.with_hi(args[0].span.lo()), "panic!(".to_string()),
                 (expr.span.with_lo(args[0].span.hi()), ")".to_string()),
             ]),
+            ("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() {
diff --git a/tests/ui/unnecessary_literal_unwrap.stderr b/tests/ui/unnecessary_literal_unwrap.stderr
@@ -64,14 +64,20 @@ help: remove the `None` and `expect()`
 LL |     let _val = panic!("this always happens");
    |                ~~~~~~~                     ~
 
+error: used `unwrap_or_default()` on `None` value
+  --> $DIR/unnecessary_literal_unwrap.rs:22:24
+   |
+LL |     let _val: String = None.unwrap_or_default();
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()`
+
 error: used `unwrap()` on `None` value
-  --> $DIR/unnecessary_literal_unwrap.rs:23:5
+  --> $DIR/unnecessary_literal_unwrap.rs:24:5
    |
 LL |     None::<()>.unwrap();
    |     ^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap()`: `panic!()`
 
 error: used `expect()` on `None` value
-  --> $DIR/unnecessary_literal_unwrap.rs:24:5
+  --> $DIR/unnecessary_literal_unwrap.rs:25:5
    |
 LL |     None::<()>.expect("this always happens");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -81,8 +87,14 @@ help: remove the `None` and `expect()`
 LL |     panic!("this always happens");
    |     ~~~~~~~                     ~
 
+error: used `unwrap_or_default()` on `None` value
+  --> $DIR/unnecessary_literal_unwrap.rs:26:5
+   |
+LL |     None::<String>.unwrap_or_default();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()`
+
 error: used `unwrap()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:28:16
+  --> $DIR/unnecessary_literal_unwrap.rs:30:16
    |
 LL |     let _val = Ok::<_, ()>(1).unwrap();
    |                ^^^^^^^^^^^^^^^^^^^^^^^
@@ -94,7 +106,7 @@ LL +     let _val = 1;
    |
 
 error: used `expect()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:29:16
+  --> $DIR/unnecessary_literal_unwrap.rs:31:16
    |
 LL |     let _val = Ok::<_, ()>(1).expect("this never happens");
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -106,7 +118,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_err()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:30:16
+  --> $DIR/unnecessary_literal_unwrap.rs:32:16
    |
 LL |     let _val = Ok::<_, ()>(1).unwrap_err();
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -117,7 +129,7 @@ LL |     let _val = panic!("{:?}", 1);
    |                ~~~~~~~~~~~~~~  ~
 
 error: used `expect_err()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:31:16
+  --> $DIR/unnecessary_literal_unwrap.rs:33:16
    |
 LL |     let _val = Ok::<_, ()>(1).expect_err("this always happens");
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -128,7 +140,7 @@ LL |     let _val = panic!("{1}: {:?}", 1, "this always happens");
    |                ~~~~~~~~~~~~~~~~~~~  ~
 
 error: used `unwrap()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:33:5
+  --> $DIR/unnecessary_literal_unwrap.rs:35:5
    |
 LL |     Ok::<_, ()>(1).unwrap();
    |     ^^^^^^^^^^^^^^^^^^^^^^^
@@ -140,7 +152,7 @@ LL +     1;
    |
 
 error: used `expect()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:34:5
+  --> $DIR/unnecessary_literal_unwrap.rs:36:5
    |
 LL |     Ok::<_, ()>(1).expect("this never happens");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -152,7 +164,7 @@ LL +     1;
    |
 
 error: used `unwrap_err()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:35:5
+  --> $DIR/unnecessary_literal_unwrap.rs:37:5
    |
 LL |     Ok::<_, ()>(1).unwrap_err();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -163,7 +175,7 @@ LL |     panic!("{:?}", 1);
    |     ~~~~~~~~~~~~~~  ~
 
 error: used `expect_err()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:36:5
+  --> $DIR/unnecessary_literal_unwrap.rs:38:5
    |
 LL |     Ok::<_, ()>(1).expect_err("this always happens");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -174,7 +186,7 @@ LL |     panic!("{1}: {:?}", 1, "this always happens");
    |     ~~~~~~~~~~~~~~~~~~~  ~
 
 error: used `unwrap_err()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:40:16
+  --> $DIR/unnecessary_literal_unwrap.rs:42:16
    |
 LL |     let _val = Err::<(), _>(1).unwrap_err();
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -186,7 +198,7 @@ LL +     let _val = 1;
    |
 
 error: used `expect_err()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:41:16
+  --> $DIR/unnecessary_literal_unwrap.rs:43:16
    |
 LL |     let _val = Err::<(), _>(1).expect_err("this never happens");
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -198,7 +210,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:42:16
+  --> $DIR/unnecessary_literal_unwrap.rs:44:16
    |
 LL |     let _val = Err::<(), _>(1).unwrap();
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -209,7 +221,7 @@ LL |     let _val = panic!("{:?}", 1);
    |                ~~~~~~~~~~~~~~  ~
 
 error: used `expect()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:43:16
+  --> $DIR/unnecessary_literal_unwrap.rs:45:16
    |
 LL |     let _val = Err::<(), _>(1).expect("this always happens");
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -220,7 +232,7 @@ LL |     let _val = panic!("{1}: {:?}", 1, "this always happens");
    |                ~~~~~~~~~~~~~~~~~~~  ~
 
 error: used `unwrap_err()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:45:5
+  --> $DIR/unnecessary_literal_unwrap.rs:47:5
    |
 LL |     Err::<(), _>(1).unwrap_err();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -232,7 +244,7 @@ LL +     1;
    |
 
 error: used `expect_err()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:46:5
+  --> $DIR/unnecessary_literal_unwrap.rs:48:5
    |
 LL |     Err::<(), _>(1).expect_err("this never happens");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -244,7 +256,7 @@ LL +     1;
    |
 
 error: used `unwrap()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:47:5
+  --> $DIR/unnecessary_literal_unwrap.rs:49:5
    |
 LL |     Err::<(), _>(1).unwrap();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -255,7 +267,7 @@ LL |     panic!("{:?}", 1);
    |     ~~~~~~~~~~~~~~  ~
 
 error: used `expect()` on `Err` value
-  --> $DIR/unnecessary_literal_unwrap.rs:48:5
+  --> $DIR/unnecessary_literal_unwrap.rs:50:5
    |
 LL |     Err::<(), _>(1).expect("this always happens");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -266,7 +278,7 @@ LL |     panic!("{1}: {:?}", 1, "this always happens");
    |     ~~~~~~~~~~~~~~~~~~~  ~
 
 error: used `unwrap_or()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:52:16
+  --> $DIR/unnecessary_literal_unwrap.rs:54:16
    |
 LL |     let _val = Some(1).unwrap_or(2);
    |                ^^^^^^^^^^^^^^^^^^^^
@@ -278,7 +290,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or_default()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:53:16
+  --> $DIR/unnecessary_literal_unwrap.rs:55:16
    |
 LL |     let _val = Some(1).unwrap_or_default();
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -290,7 +302,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or_else()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:54:16
+  --> $DIR/unnecessary_literal_unwrap.rs:56:16
    |
 LL |     let _val = Some(1).unwrap_or_else(|| 2);
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -302,7 +314,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:56:5
+  --> $DIR/unnecessary_literal_unwrap.rs:58:5
    |
 LL |     Some(1).unwrap_or(2);
    |     ^^^^^^^^^^^^^^^^^^^^
@@ -314,7 +326,7 @@ LL +     1;
    |
 
 error: used `unwrap_or_default()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:57:5
+  --> $DIR/unnecessary_literal_unwrap.rs:59:5
    |
 LL |     Some(1).unwrap_or_default();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -326,7 +338,7 @@ LL +     1;
    |
 
 error: used `unwrap_or_else()` on `Some` value
-  --> $DIR/unnecessary_literal_unwrap.rs:58:5
+  --> $DIR/unnecessary_literal_unwrap.rs:60:5
    |
 LL |     Some(1).unwrap_or_else(|| 2);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -338,7 +350,7 @@ LL +     1;
    |
 
 error: used `unwrap_or()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:62:16
+  --> $DIR/unnecessary_literal_unwrap.rs:64:16
    |
 LL |     let _val = Ok::<_, ()>(1).unwrap_or(2);
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -350,7 +362,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or_default()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:63:16
+  --> $DIR/unnecessary_literal_unwrap.rs:65:16
    |
 LL |     let _val = Ok::<_, ()>(1).unwrap_or_default();
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -362,7 +374,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or_else()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:64:16
+  --> $DIR/unnecessary_literal_unwrap.rs:66:16
    |
 LL |     let _val = Ok::<_, ()>(1).unwrap_or_else(|_| 2);
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -374,7 +386,7 @@ LL +     let _val = 1;
    |
 
 error: used `unwrap_or()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:66:5
+  --> $DIR/unnecessary_literal_unwrap.rs:68:5
    |
 LL |     Ok::<_, ()>(1).unwrap_or(2);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -386,7 +398,7 @@ LL +     1;
    |
 
 error: used `unwrap_or_default()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:67:5
+  --> $DIR/unnecessary_literal_unwrap.rs:69:5
    |
 LL |     Ok::<_, ()>(1).unwrap_or_default();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -398,7 +410,7 @@ LL +     1;
    |
 
 error: used `unwrap_or_else()` on `Ok` value
-  --> $DIR/unnecessary_literal_unwrap.rs:68:5
+  --> $DIR/unnecessary_literal_unwrap.rs:70:5
    |
 LL |     Ok::<_, ()>(1).unwrap_or_else(|_| 2);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -409,5 +421,5 @@ LL -     Ok::<_, ()>(1).unwrap_or_else(|_| 2);
 LL +     1;
    |
 
-error: aborting due to 36 previous errors
+error: aborting due to 38 previous errors
 
diff --git a/tests/ui/unnecessary_literal_unwrap_unfixable.rs b/tests/ui/unnecessary_literal_unwrap_unfixable.rs
@@ -21,6 +21,8 @@ fn unwrap_option_none() {
     let val = None::<()>;
     let _val2 = val.unwrap();
     let _val2 = val.expect("this always happens");
+    let _val3: u8 = None.unwrap_or_default();
+    None::<()>.unwrap_or_default();
 }
 
 fn unwrap_result_ok() {
diff --git a/tests/ui/unnecessary_literal_unwrap_unfixable.stderr b/tests/ui/unnecessary_literal_unwrap_unfixable.stderr

Original file line number	Diff line number	Diff line change
@@ -64,14 +64,20 @@ help: remove the `None` and `expect()`
`64`	`64`	`LL \| let _val = panic!("this always happens");`
`65`	`65`	`\| ~~~~~~~ ~`
`66`	`66`
	`67`	+error: used `unwrap_or_default()` on `None` value
	`68`	`+ --> $DIR/unnecessary_literal_unwrap.rs:22:24`
	`69`	`+ \|`
	`70`	`+LL \| let _val: String = None.unwrap_or_default();`
	`71`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()`
	`72`	`+`
`67`	`73`	error: used `unwrap()` on `None` value
`68`		`- --> $DIR/unnecessary_literal_unwrap.rs:23:5`
	`74`	`+ --> $DIR/unnecessary_literal_unwrap.rs:24:5`
`69`	`75`	`\|`
`70`	`76`	`LL \| None::<()>.unwrap();`
`71`	`77`	\| ^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap()`: `panic!()`
`72`	`78`
`73`	`79`	error: used `expect()` on `None` value
`74`		`- --> $DIR/unnecessary_literal_unwrap.rs:24:5`
	`80`	`+ --> $DIR/unnecessary_literal_unwrap.rs:25:5`
`75`	`81`	`\|`
`76`	`82`	`LL \| None::<()>.expect("this always happens");`
`77`	`83`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
@@ -81,8 +87,14 @@ help: remove the `None` and `expect()`
`81`	`87`	`LL \| panic!("this always happens");`
`82`	`88`	`\| ~~~~~~~ ~`
`83`	`89`
	`90`	+error: used `unwrap_or_default()` on `None` value
	`91`	`+ --> $DIR/unnecessary_literal_unwrap.rs:26:5`
	`92`	`+ \|`
	`93`	`+LL \| None::<String>.unwrap_or_default();`
	`94`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()`
	`95`	`+`
`84`	`96`	error: used `unwrap()` on `Ok` value
`85`		`- --> $DIR/unnecessary_literal_unwrap.rs:28:16`
	`97`	`+ --> $DIR/unnecessary_literal_unwrap.rs:30:16`
`86`	`98`	`\|`
`87`	`99`	`LL \| let _val = Ok::<_, ()>(1).unwrap();`
`88`	`100`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -94,7 +106,7 @@ LL + let _val = 1;`
`94`	`106`	`\|`
`95`	`107`
`96`	`108`	error: used `expect()` on `Ok` value
`97`		`- --> $DIR/unnecessary_literal_unwrap.rs:29:16`
	`109`	`+ --> $DIR/unnecessary_literal_unwrap.rs:31:16`
`98`	`110`	`\|`
`99`	`111`	`LL \| let _val = Ok::<_, ()>(1).expect("this never happens");`
`100`	`112`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -106,7 +118,7 @@ LL + let _val = 1;`
`106`	`118`	`\|`
`107`	`119`
`108`	`120`	error: used `unwrap_err()` on `Ok` value
`109`		`- --> $DIR/unnecessary_literal_unwrap.rs:30:16`
	`121`	`+ --> $DIR/unnecessary_literal_unwrap.rs:32:16`
`110`	`122`	`\|`
`111`	`123`	`LL \| let _val = Ok::<_, ()>(1).unwrap_err();`
`112`	`124`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -117,7 +129,7 @@ LL \| let _val = panic!("{:?}", 1);`
`117`	`129`	`\| ~~~~~~~~~~~~~~ ~`
`118`	`130`
`119`	`131`	error: used `expect_err()` on `Ok` value
`120`		`- --> $DIR/unnecessary_literal_unwrap.rs:31:16`
	`132`	`+ --> $DIR/unnecessary_literal_unwrap.rs:33:16`
`121`	`133`	`\|`
`122`	`134`	`LL \| let _val = Ok::<_, ()>(1).expect_err("this always happens");`
`123`	`135`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -128,7 +140,7 @@ LL \| let _val = panic!("{1}: {:?}", 1, "this always happens");`
`128`	`140`	`\| ~~~~~~~~~~~~~~~~~~~ ~`
`129`	`141`
`130`	`142`	error: used `unwrap()` on `Ok` value
`131`		`- --> $DIR/unnecessary_literal_unwrap.rs:33:5`
	`143`	`+ --> $DIR/unnecessary_literal_unwrap.rs:35:5`
`132`	`144`	`\|`
`133`	`145`	`LL \| Ok::<_, ()>(1).unwrap();`
`134`	`146`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -140,7 +152,7 @@ LL + 1;`
`140`	`152`	`\|`
`141`	`153`
`142`	`154`	error: used `expect()` on `Ok` value
`143`		`- --> $DIR/unnecessary_literal_unwrap.rs:34:5`
	`155`	`+ --> $DIR/unnecessary_literal_unwrap.rs:36:5`
`144`	`156`	`\|`
`145`	`157`	`LL \| Ok::<_, ()>(1).expect("this never happens");`
`146`	`158`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -152,7 +164,7 @@ LL + 1;`
`152`	`164`	`\|`
`153`	`165`
`154`	`166`	error: used `unwrap_err()` on `Ok` value
`155`		`- --> $DIR/unnecessary_literal_unwrap.rs:35:5`
	`167`	`+ --> $DIR/unnecessary_literal_unwrap.rs:37:5`
`156`	`168`	`\|`
`157`	`169`	`LL \| Ok::<_, ()>(1).unwrap_err();`
`158`	`170`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -163,7 +175,7 @@ LL \| panic!("{:?}", 1);`
`163`	`175`	`\| ~~~~~~~~~~~~~~ ~`
`164`	`176`
`165`	`177`	error: used `expect_err()` on `Ok` value
`166`		`- --> $DIR/unnecessary_literal_unwrap.rs:36:5`
	`178`	`+ --> $DIR/unnecessary_literal_unwrap.rs:38:5`
`167`	`179`	`\|`
`168`	`180`	`LL \| Ok::<_, ()>(1).expect_err("this always happens");`
`169`	`181`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -174,7 +186,7 @@ LL \| panic!("{1}: {:?}", 1, "this always happens");`
`174`	`186`	`\| ~~~~~~~~~~~~~~~~~~~ ~`
`175`	`187`
`176`	`188`	error: used `unwrap_err()` on `Err` value
`177`		`- --> $DIR/unnecessary_literal_unwrap.rs:40:16`
	`189`	`+ --> $DIR/unnecessary_literal_unwrap.rs:42:16`
`178`	`190`	`\|`
`179`	`191`	`LL \| let _val = Err::<(), _>(1).unwrap_err();`
`180`	`192`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -186,7 +198,7 @@ LL + let _val = 1;`
`186`	`198`	`\|`
`187`	`199`
`188`	`200`	error: used `expect_err()` on `Err` value
`189`		`- --> $DIR/unnecessary_literal_unwrap.rs:41:16`
	`201`	`+ --> $DIR/unnecessary_literal_unwrap.rs:43:16`
`190`	`202`	`\|`
`191`	`203`	`LL \| let _val = Err::<(), _>(1).expect_err("this never happens");`
`192`	`204`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -198,7 +210,7 @@ LL + let _val = 1;`
`198`	`210`	`\|`
`199`	`211`
`200`	`212`	error: used `unwrap()` on `Err` value
`201`		`- --> $DIR/unnecessary_literal_unwrap.rs:42:16`
	`213`	`+ --> $DIR/unnecessary_literal_unwrap.rs:44:16`
`202`	`214`	`\|`
`203`	`215`	`LL \| let _val = Err::<(), _>(1).unwrap();`
`204`	`216`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -209,7 +221,7 @@ LL \| let _val = panic!("{:?}", 1);`
`209`	`221`	`\| ~~~~~~~~~~~~~~ ~`
`210`	`222`
`211`	`223`	error: used `expect()` on `Err` value
`212`		`- --> $DIR/unnecessary_literal_unwrap.rs:43:16`
	`224`	`+ --> $DIR/unnecessary_literal_unwrap.rs:45:16`
`213`	`225`	`\|`
`214`	`226`	`LL \| let _val = Err::<(), _>(1).expect("this always happens");`
`215`	`227`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -220,7 +232,7 @@ LL \| let _val = panic!("{1}: {:?}", 1, "this always happens");`
`220`	`232`	`\| ~~~~~~~~~~~~~~~~~~~ ~`
`221`	`233`
`222`	`234`	error: used `unwrap_err()` on `Err` value
`223`		`- --> $DIR/unnecessary_literal_unwrap.rs:45:5`
	`235`	`+ --> $DIR/unnecessary_literal_unwrap.rs:47:5`
`224`	`236`	`\|`
`225`	`237`	`LL \| Err::<(), _>(1).unwrap_err();`
`226`	`238`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -232,7 +244,7 @@ LL + 1;`
`232`	`244`	`\|`
`233`	`245`
`234`	`246`	error: used `expect_err()` on `Err` value
`235`		`- --> $DIR/unnecessary_literal_unwrap.rs:46:5`
	`247`	`+ --> $DIR/unnecessary_literal_unwrap.rs:48:5`
`236`	`248`	`\|`
`237`	`249`	`LL \| Err::<(), _>(1).expect_err("this never happens");`
`238`	`250`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -244,7 +256,7 @@ LL + 1;`
`244`	`256`	`\|`
`245`	`257`
`246`	`258`	error: used `unwrap()` on `Err` value
`247`		`- --> $DIR/unnecessary_literal_unwrap.rs:47:5`
	`259`	`+ --> $DIR/unnecessary_literal_unwrap.rs:49:5`
`248`	`260`	`\|`
`249`	`261`	`LL \| Err::<(), _>(1).unwrap();`
`250`	`262`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -255,7 +267,7 @@ LL \| panic!("{:?}", 1);`
`255`	`267`	`\| ~~~~~~~~~~~~~~ ~`
`256`	`268`
`257`	`269`	error: used `expect()` on `Err` value
`258`		`- --> $DIR/unnecessary_literal_unwrap.rs:48:5`
	`270`	`+ --> $DIR/unnecessary_literal_unwrap.rs:50:5`
`259`	`271`	`\|`
`260`	`272`	`LL \| Err::<(), _>(1).expect("this always happens");`
`261`	`273`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -266,7 +278,7 @@ LL \| panic!("{1}: {:?}", 1, "this always happens");`
`266`	`278`	`\| ~~~~~~~~~~~~~~~~~~~ ~`
`267`	`279`
`268`	`280`	error: used `unwrap_or()` on `Some` value
`269`		`- --> $DIR/unnecessary_literal_unwrap.rs:52:16`
	`281`	`+ --> $DIR/unnecessary_literal_unwrap.rs:54:16`
`270`	`282`	`\|`
`271`	`283`	`LL \| let _val = Some(1).unwrap_or(2);`
`272`	`284`	`\| ^^^^^^^^^^^^^^^^^^^^`
`@@ -278,7 +290,7 @@ LL + let _val = 1;`
`278`	`290`	`\|`
`279`	`291`
`280`	`292`	error: used `unwrap_or_default()` on `Some` value
`281`		`- --> $DIR/unnecessary_literal_unwrap.rs:53:16`
	`293`	`+ --> $DIR/unnecessary_literal_unwrap.rs:55:16`
`282`	`294`	`\|`
`283`	`295`	`LL \| let _val = Some(1).unwrap_or_default();`
`284`	`296`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -290,7 +302,7 @@ LL + let _val = 1;`
`290`	`302`	`\|`
`291`	`303`
`292`	`304`	error: used `unwrap_or_else()` on `Some` value
`293`		`- --> $DIR/unnecessary_literal_unwrap.rs:54:16`
	`305`	`+ --> $DIR/unnecessary_literal_unwrap.rs:56:16`
`294`	`306`	`\|`
`295`	`307`	`LL \| let _val = Some(1).unwrap_or_else(\|\| 2);`
`296`	`308`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -302,7 +314,7 @@ LL + let _val = 1;`
`302`	`314`	`\|`
`303`	`315`
`304`	`316`	error: used `unwrap_or()` on `Some` value
`305`		`- --> $DIR/unnecessary_literal_unwrap.rs:56:5`
	`317`	`+ --> $DIR/unnecessary_literal_unwrap.rs:58:5`
`306`	`318`	`\|`
`307`	`319`	`LL \| Some(1).unwrap_or(2);`
`308`	`320`	`\| ^^^^^^^^^^^^^^^^^^^^`
`@@ -314,7 +326,7 @@ LL + 1;`
`314`	`326`	`\|`
`315`	`327`
`316`	`328`	error: used `unwrap_or_default()` on `Some` value
`317`		`- --> $DIR/unnecessary_literal_unwrap.rs:57:5`
	`329`	`+ --> $DIR/unnecessary_literal_unwrap.rs:59:5`
`318`	`330`	`\|`
`319`	`331`	`LL \| Some(1).unwrap_or_default();`
`320`	`332`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -326,7 +338,7 @@ LL + 1;`
`326`	`338`	`\|`
`327`	`339`
`328`	`340`	error: used `unwrap_or_else()` on `Some` value
`329`		`- --> $DIR/unnecessary_literal_unwrap.rs:58:5`
	`341`	`+ --> $DIR/unnecessary_literal_unwrap.rs:60:5`
`330`	`342`	`\|`
`331`	`343`	`LL \| Some(1).unwrap_or_else(\|\| 2);`
`332`	`344`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -338,7 +350,7 @@ LL + 1;`
`338`	`350`	`\|`
`339`	`351`
`340`	`352`	error: used `unwrap_or()` on `Ok` value
`341`		`- --> $DIR/unnecessary_literal_unwrap.rs:62:16`
	`353`	`+ --> $DIR/unnecessary_literal_unwrap.rs:64:16`
`342`	`354`	`\|`
`343`	`355`	`LL \| let _val = Ok::<_, ()>(1).unwrap_or(2);`
`344`	`356`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -350,7 +362,7 @@ LL + let _val = 1;`
`350`	`362`	`\|`
`351`	`363`
`352`	`364`	error: used `unwrap_or_default()` on `Ok` value
`353`		`- --> $DIR/unnecessary_literal_unwrap.rs:63:16`
	`365`	`+ --> $DIR/unnecessary_literal_unwrap.rs:65:16`
`354`	`366`	`\|`
`355`	`367`	`LL \| let _val = Ok::<_, ()>(1).unwrap_or_default();`
`356`	`368`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -362,7 +374,7 @@ LL + let _val = 1;`
`362`	`374`	`\|`
`363`	`375`
`364`	`376`	error: used `unwrap_or_else()` on `Ok` value
`365`		`- --> $DIR/unnecessary_literal_unwrap.rs:64:16`
	`377`	`+ --> $DIR/unnecessary_literal_unwrap.rs:66:16`
`366`	`378`	`\|`
`367`	`379`	`LL \| let _val = Ok::<_, ()>(1).unwrap_or_else(\|_\| 2);`
`368`	`380`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -374,7 +386,7 @@ LL + let _val = 1;`
`374`	`386`	`\|`
`375`	`387`
`376`	`388`	error: used `unwrap_or()` on `Ok` value
`377`		`- --> $DIR/unnecessary_literal_unwrap.rs:66:5`
	`389`	`+ --> $DIR/unnecessary_literal_unwrap.rs:68:5`
`378`	`390`	`\|`
`379`	`391`	`LL \| Ok::<_, ()>(1).unwrap_or(2);`
`380`	`392`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -386,7 +398,7 @@ LL + 1;`
`386`	`398`	`\|`
`387`	`399`
`388`	`400`	error: used `unwrap_or_default()` on `Ok` value
`389`		`- --> $DIR/unnecessary_literal_unwrap.rs:67:5`
	`401`	`+ --> $DIR/unnecessary_literal_unwrap.rs:69:5`
`390`	`402`	`\|`
`391`	`403`	`LL \| Ok::<_, ()>(1).unwrap_or_default();`
`392`	`404`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -398,7 +410,7 @@ LL + 1;`
`398`	`410`	`\|`
`399`	`411`
`400`	`412`	error: used `unwrap_or_else()` on `Ok` value
`401`		`- --> $DIR/unnecessary_literal_unwrap.rs:68:5`
	`413`	`+ --> $DIR/unnecessary_literal_unwrap.rs:70:5`
`402`	`414`	`\|`
`403`	`415`	`LL \| Ok::<_, ()>(1).unwrap_or_else(\|_\| 2);`
`404`	`416`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -409,5 +421,5 @@ LL - Ok::<_, ()>(1).unwrap_or_else(\|_\| 2);`
`409`	`421`	`LL + 1;`
`410`	`422`	`\|`
`411`	`423`
`412`		`-error: aborting due to 36 previous errors`
	`424`	`+error: aborting due to 38 previous errors`
`413`	`425`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ fn unwrap_option_none() {`
`21`	`21`	`let val = None::<()>;`
`22`	`22`	`let _val2 = val.unwrap();`
`23`	`23`	`let _val2 = val.expect("this always happens");`
	`24`	`+ let _val3: u8 = None.unwrap_or_default();`
	`25`	`+ None::<()>.unwrap_or_default();`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`fn unwrap_result_ok() {`