Auto merge of #3603 - xfix:random-state-lint, r=phansch

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

diff --git a/tests/ui/question_mark.stderr b/tests/ui/question_mark.stderr
index e97b1869824fcb77895c72402a6a7ff01b0894b6..a0b8781377048ef2c9d374bde6832f0e7fe44e80 100644 (file)
--- a/tests/ui/question_mark.stderr
+++ b/tests/ui/question_mark.stderr
@@ -1,22 +1,63 @@
 error: this block may be rewritten with the `?` operator
- --> $DIR/question_mark.rs:2:2
-  |
-2 |       if a.is_none() {
-  |  _____^
-3 | |         return None
-4 | |     }
-  | |_____^ help: replace_it_with: `a?;`
-  |
-  = note: `-D question-mark` implied by `-D warnings`
+  --> $DIR/question_mark.rs:11:5
+   |
+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:37:3
+  --> $DIR/question_mark.rs:56:9
    |
-37 |           if (self.opt).is_none() {
-   |  _________^
-38 | |             return None;
-39 | |         }
+LL | /         if (self.opt).is_none() {
+LL | |             return None;
+LL | |         }
    | |_________^ help: replace_it_with: `(self.opt)?;`
 
-error: aborting due to 2 previous errors
+error: this block may be rewritten with the `?` operator
+  --> $DIR/question_mark.rs:60: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:64: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:81: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:89: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:97:9
+   |
+LL | /         if self.opt.is_none() {
+LL | |             return None;
+LL | |         }
+   | |_________^ help: replace_it_with: `self.opt.as_ref()?;`
+
+error: aborting due to 7 previous errors