`assertions_on_result_states` fix suggestion when `assert!` not in a statement

[rust.git] / tests / ui / question_mark.stderr

diff --git a/tests/ui/question_mark.stderr b/tests/ui/question_mark.stderr
index f55a83d43c890dbd7c7e4281ff1c1776824f20e6..1b6cd524b2f2339484878443a9e09f2acc00917a 100644 (file)
--- a/tests/ui/question_mark.stderr
+++ b/tests/ui/question_mark.stderr
@@ -1,63 +1,134 @@
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:11:5
+  --> $DIR/question_mark.rs:7:5
    |
-11 | /     if a.is_none() {
-12 | |         return None;
-13 | |     }
-   | |_____^ help: replace_it_with: `a?;`
+LL | /     if a.is_none() {
+LL | |         return None;
+LL | |     }
+   | |_____^ help: replace it with: `a?;`
    |
    = note: `-D clippy::question-mark` implied by `-D warnings`
 
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:52:9
+   |
+LL | /         if (self.opt).is_none() {
+LL | |             return None;
+LL | |         }
+   | |_________^ help: replace it with: `(self.opt)?;`
+
 error: this block may be rewritten with the `?` operator
   --> $DIR/question_mark.rs:56:9
    |
-56 | /         if (self.opt).is_none() {
-57 | |             return None;
-58 | |         }
-   | |_________^ help: replace_it_with: `(self.opt)?;`
+LL | /         if self.opt.is_none() {
+LL | |             return None
+LL | |         }
+   | |_________^ help: replace it with: `self.opt?;`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:60:17
+   |
+LL |           let _ = if self.opt.is_none() {
+   |  _________________^
+LL | |             return None;
+LL | |         } else {
+LL | |             self.opt
+LL | |         };
+   | |_________^ help: replace it with: `Some(self.opt?)`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:66:17
+   |
+LL |           let _ = if let Some(x) = self.opt {
+   |  _________________^
+LL | |             x
+LL | |         } else {
+LL | |             return None;
+LL | |         };
+   | |_________^ help: replace it with: `self.opt?`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:83:9
+   |
+LL | /         if self.opt.is_none() {
+LL | |             return None;
+LL | |         }
+   | |_________^ help: replace it with: `self.opt.as_ref()?;`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:91:9
+   |
+LL | /         if self.opt.is_none() {
+LL | |             return None;
+LL | |         }
+   | |_________^ help: replace it with: `self.opt.as_ref()?;`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:99:9
+   |
+LL | /         if self.opt.is_none() {
+LL | |             return None;
+LL | |         }
+   | |_________^ help: replace it with: `self.opt.as_ref()?;`
 
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:60:9
+  --> $DIR/question_mark.rs:106:26
    |
-60 | /         if self.opt.is_none() {
-61 | |             return None
-62 | |         }
-   | |_________^ help: replace_it_with: `self.opt?;`
+LL |           let v: &Vec<_> = if let Some(ref v) = self.opt {
+   |  __________________________^
+LL | |             v
+LL | |         } else {
+LL | |             return None;
+LL | |         };
+   | |_________^ help: replace it with: `self.opt.as_ref()?`
 
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:64:17
+  --> $DIR/question_mark.rs:116:17
    |
-64 |           let _ = if self.opt.is_none() {
+LL |           let v = if let Some(v) = self.opt {
    |  _________________^
-65 | |             return None;
-66 | |         } else {
-67 | |             self.opt
-68 | |         };
-   | |_________^ help: replace_it_with: `Some(self.opt?)`
+LL | |             v
+LL | |         } else {
+LL | |             return None;
+LL | |         };
+   | |_________^ help: replace it with: `self.opt?`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:131:5
+   |
+LL | /     if f().is_none() {
+LL | |         return None;
+LL | |     }
+   | |_____^ help: replace it with: `f()?;`
+
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:143:13
+   |
+LL |     let _ = if let Ok(x) = x { x } else { return x };
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `x?`
 
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:81:9
+  --> $DIR/question_mark.rs:145:5
    |
-81 | /         if self.opt.is_none() {
-82 | |             return None;
-83 | |         }
-   | |_________^ help: replace_it_with: `self.opt.as_ref()?;`
+LL | /     if x.is_err() {
+LL | |         return x;
+LL | |     }
+   | |_____^ help: replace it with: `x?;`
 
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:89:9
+  --> $DIR/question_mark.rs:193:5
    |
-89 | /         if self.opt.is_none() {
-90 | |             return None;
-91 | |         }
-   | |_________^ help: replace_it_with: `self.opt.as_ref()?;`
+LL | /     if let Err(err) = func_returning_result() {
+LL | |         return Err(err);
+LL | |     }
+   | |_____^ help: replace it with: `func_returning_result()?;`
 
 error: this block may be rewritten with the `?` operator
-  --> $DIR/question_mark.rs:97:9
+  --> $DIR/question_mark.rs:200:5
    |
-97 | /         if self.opt.is_none() {
-98 | |             return None;
-99 | |         }
-   | |_________^ help: replace_it_with: `self.opt.as_ref()?;`
+LL | /     if let Err(err) = func_returning_result() {
+LL | |         return Err(err);
+LL | |     }
+   | |_____^ help: replace it with: `func_returning_result()?;`
 
-error: aborting due to 7 previous errors
+error: aborting due to 15 previous errors