about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Regueiro <alexreg@me.com>2018-12-15 17:31:46 +0000
committerAlexander Regueiro <alexreg@me.com>2018-12-15 20:54:05 +0000
commit0211856c0e381c658b2decca0f31e4c9579d8e0d (patch)
treefda4256f97b4a94f18ca61a3e5ca7e170fc260a6
parent616885ec2c529bc795995108ac5c87d1c532b17f (diff)
downloadrust-0211856c0e381c658b2decca0f31e4c9579d8e0d.tar.gz
rust-0211856c0e381c658b2decca0f31e4c9579d8e0d.zip
Corrected expected test err messages.
-rw-r--r--src/test/ui/issues/issue-56199.rs8
-rw-r--r--src/test/ui/issues/issue-56199.stderr8
-rw-r--r--src/test/ui/issues/issue-56835.rs2
-rw-r--r--src/test/ui/issues/issue-56835.stderr2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/test/ui/issues/issue-56199.rs b/src/test/ui/issues/issue-56199.rs
index bbd51823cf1..83d4e31b5d1 100644
--- a/src/test/ui/issues/issue-56199.rs
+++ b/src/test/ui/issues/issue-56199.rs
@@ -5,18 +5,18 @@ struct Bar {}
 impl Foo {
     fn foo() {
         let _ = Self;
-        //~^ ERROR the `Self` constructor can only be used with tuple structs
+        //~^ ERROR the `Self` constructor can only be used with tuple or unit structs
         let _ = Self();
-        //~^ ERROR the `Self` constructor can only be used with tuple structs
+        //~^ ERROR the `Self` constructor can only be used with tuple or unit structs
     }
 }
 
 impl Bar {
     fn bar() {
         let _ = Self;
-        //~^ ERROR the `Self` constructor can only be used with tuple structs
+        //~^ ERROR the `Self` constructor can only be used with tuple or unit structs
         let _ = Self();
-        //~^ ERROR the `Self` constructor can only be used with tuple structs
+        //~^ ERROR the `Self` constructor can only be used with tuple or unit structs
     }
 }
 
diff --git a/src/test/ui/issues/issue-56199.stderr b/src/test/ui/issues/issue-56199.stderr
index feb88e926b2..6e3c7fd17b4 100644
--- a/src/test/ui/issues/issue-56199.stderr
+++ b/src/test/ui/issues/issue-56199.stderr
@@ -1,4 +1,4 @@
-error: the `Self` constructor can only be used with tuple structs
+error: the `Self` constructor can only be used with tuple or unit structs
   --> $DIR/issue-56199.rs:7:17
    |
 LL |         let _ = Self;
@@ -6,7 +6,7 @@ LL |         let _ = Self;
    |
    = note: did you mean to use one of the enum's variants?
 
-error: the `Self` constructor can only be used with tuple structs
+error: the `Self` constructor can only be used with tuple or unit structs
   --> $DIR/issue-56199.rs:9:17
    |
 LL |         let _ = Self();
@@ -14,13 +14,13 @@ LL |         let _ = Self();
    |
    = note: did you mean to use one of the enum's variants?
 
-error: the `Self` constructor can only be used with tuple structs
+error: the `Self` constructor can only be used with tuple or unit structs
   --> $DIR/issue-56199.rs:16:17
    |
 LL |         let _ = Self;
    |                 ^^^^ did you mean `Self { /* fields */ }`?
 
-error: the `Self` constructor can only be used with tuple structs
+error: the `Self` constructor can only be used with tuple or unit structs
   --> $DIR/issue-56199.rs:18:17
    |
 LL |         let _ = Self();
diff --git a/src/test/ui/issues/issue-56835.rs b/src/test/ui/issues/issue-56835.rs
index 0b3a665ccf9..c16550e3701 100644
--- a/src/test/ui/issues/issue-56835.rs
+++ b/src/test/ui/issues/issue-56835.rs
@@ -3,7 +3,7 @@ pub struct Foo {}
 
 impl Foo {
     fn bar(Self(foo): Self) {}
-    //~^ ERROR the `Self` constructor can only be used with tuple structs
+    //~^ ERROR the `Self` constructor can only be used with tuple or unit structs
     //~^^ ERROR expected tuple struct/variant, found self constructor `Self` [E0164]
 }
 
diff --git a/src/test/ui/issues/issue-56835.stderr b/src/test/ui/issues/issue-56835.stderr
index 32bbc49ffd9..b7c3b142ec4 100644
--- a/src/test/ui/issues/issue-56835.stderr
+++ b/src/test/ui/issues/issue-56835.stderr
@@ -1,4 +1,4 @@
-error: the `Self` constructor can only be used with tuple structs
+error: the `Self` constructor can only be used with tuple or unit structs
   --> $DIR/issue-56835.rs:5:12
    |
 LL |     fn bar(Self(foo): Self) {}