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

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

diff --git a/tests/ui/diverging_sub_expression.stderr b/tests/ui/diverging_sub_expression.stderr
index 805a01840de73b32f6ebb4b734cf73fa5ee2bd80..1cfec07c5603e5b1eb47ecd8bd44b1ebf25b2f93 100644 (file)
--- a/tests/ui/diverging_sub_expression.stderr
+++ b/tests/ui/diverging_sub_expression.stderr
@@ -1,43 +1,39 @@
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:18:10
+  --> $DIR/diverging_sub_expression.rs:30:10
    |
-18 |     b || diverge(); //~ ERROR sub-expression diverges
+LL |     b || diverge();
    |          ^^^^^^^^^
    |
-note: lint level defined here
-  --> $DIR/diverging_sub_expression.rs:3:9
-   |
-3  | #![deny(diverging_sub_expression)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: `-D clippy::diverging-sub-expression` implied by `-D warnings`
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:19:10
+  --> $DIR/diverging_sub_expression.rs:31:10
    |
-19 |     b || A.foo(); //~ ERROR sub-expression diverges
+LL |     b || A.foo();
    |          ^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:28:26
+  --> $DIR/diverging_sub_expression.rs:40:26
    |
-28 |             6 => true || return, //~ ERROR sub-expression diverges
+LL |             6 => true || return,
    |                          ^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:29:26
+  --> $DIR/diverging_sub_expression.rs:41:26
    |
-29 |             7 => true || continue, //~ ERROR sub-expression diverges
+LL |             7 => true || continue,
    |                          ^^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:32:26
+  --> $DIR/diverging_sub_expression.rs:44:26
    |
-32 |             3 => true || diverge(), //~ ERROR sub-expression diverges
+LL |             3 => true || diverge(),
    |                          ^^^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:37:26
+  --> $DIR/diverging_sub_expression.rs:49:26
    |
-37 |             _ => true || break, //~ ERROR sub-expression diverges
+LL |             _ => true || break,
    |                          ^^^^^
 
 error: aborting due to 6 previous errors