Auto merge of #5562 - flip1995:clippyup_up, r=phansch

[rust.git] / tests / ui / or_fun_call.rs

diff --git a/tests/ui/or_fun_call.rs b/tests/ui/or_fun_call.rs
index 78bcf896ec1dc1e2a93501bf8e14d53a3cd0bcdb..522f31b72d01f4d94a590dd179a86c287d1c6db4 100644 (file)
--- a/tests/ui/or_fun_call.rs
+++ b/tests/ui/or_fun_call.rs
@@ -55,8 +55,6 @@ fn make<T>() -> T {
     let with_vec = Some(vec![1]);
     with_vec.unwrap_or(vec![]);
 
-    // FIXME #944: ~|SUGGESTION with_vec.unwrap_or_else(|| vec![]);
-
     let without_default = Some(Foo);
     without_default.unwrap_or(Foo::new());
 
@@ -97,8 +95,16 @@ fn test_or_with_ctors() {
     let b = "b".to_string();
     let _ = Some(Bar("a".to_string(), Duration::from_secs(1)))
         .or(Some(Bar(b, Duration::from_secs(2))));
-}
 
+    let vec = vec!["foo"];
+    let _ = opt.ok_or(vec.len());
+
+    let array = ["foo"];
+    let _ = opt.ok_or(array.len());
+
+    let slice = &["foo"][..];
+    let _ = opt.ok_or(slice.len());
+}
 
 // Issue 4514 - early return
 fn f() -> Option<()> {
@@ -110,5 +116,4 @@ fn f() -> Option<()> {
     Some(())
 }
 
-
 fn main() {}