More relevant tests

diff --git a/tests/ui/is_unit_expr.rs b/tests/ui/is_unit_expr.rs
index 0919e7f36753eae2ff08e1c1c7252c3fd6708fcf..60b07f45c6a8a6254bcb8bd3979fcf6cd3322943 100644 (file)
--- a/tests/ui/is_unit_expr.rs
+++ b/tests/ui/is_unit_expr.rs
@@ -1,9 +1,8 @@
-
 #![feature(plugin)]
-#[plugin(clippy)]
-#[warn(unit_expr)]
+#![plugin(clippy)]
+
+#![warn(unit_expr)]
 #[allow(unused_variables)]
-#[allow(no_effect)]
 
 fn main() {
     let x = {

diff --git a/tests/ui/is_unit_expr.stderr b/tests/ui/is_unit_expr.stderr
index c6e2c3aaf7b6aece8e2dfac1c735b3c473556085..73b1e04cba790ac87be7026cea1cedc59d3dddd6 100644 (file)
--- a/tests/ui/is_unit_expr.stderr
+++ b/tests/ui/is_unit_expr.stderr
@@ -1,16 +1,19 @@
-error: unknown lint: `unit_expr`
- --> $DIR/is_unit_expr.rs:4:8
-  |
-4 | #[warn(unit_expr)]
-  |        ^^^^^^^^^
-  |
-  = note: `-D unknown-lints` implied by `-D warnings`
+error: This expression assigns the Unit type ()
+  --> $DIR/is_unit_expr.rs:8:13
+   |
+8  |       let x = {
+   |  _____________^
+9  | |         "foo";
+10 | |         "baz";
+11 | |     };
+   | |_____^
+   |
+   = note: `-D unit-expr` implied by `-D warnings`
+note: Consider removing the trailing semicolon
+  --> $DIR/is_unit_expr.rs:10:9
+   |
+10 |         "baz";
+   |         ^^^^^^
 
-error: unknown lint: `no_effect`
- --> $DIR/is_unit_expr.rs:6:9
-  |
-6 | #[allow(no_effect)]
-  |         ^^^^^^^^^
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error