From 7d3a6f16551fa9ff54fbfa9c648c21ae0f6d550f Mon Sep 17 00:00:00 2001
From: Henry Boisdequin <65845077+henryboisdequin@users.noreply.github.com>
Date: Wed, 3 Mar 2021 17:09:40 +0530
Subject: address comments

---
 src/test/ui/79040.rs                                  |  5 -----
 src/test/ui/79040.stderr                              | 19 -------------------
 .../parser/item-free-const-no-body-semantic-fail.rs   |  1 -
 .../parser/item-free-static-no-body-semantic-fail.rs  |  2 --
 .../item-free-static-no-body-semantic-fail.stderr     |  4 ++--
 src/test/ui/typeck/issue-79040.rs                     |  5 +++++
 src/test/ui/typeck/issue-79040.stderr                 | 19 +++++++++++++++++++
 7 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 src/test/ui/79040.rs
 delete mode 100644 src/test/ui/79040.stderr
 create mode 100644 src/test/ui/typeck/issue-79040.rs
 create mode 100644 src/test/ui/typeck/issue-79040.stderr

(limited to 'src/test')

diff --git a/src/test/ui/79040.rs b/src/test/ui/79040.rs
deleted file mode 100644
index adc9dc8b426..00000000000
--- a/src/test/ui/79040.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    const FOO = "hello" + 1;
-    //^~ ERROR cannot add `{integer}` to `&str`
-    println!("{}", FOO);
-}
\ No newline at end of file
diff --git a/src/test/ui/79040.stderr b/src/test/ui/79040.stderr
deleted file mode 100644
index be7d2363c2d..00000000000
--- a/src/test/ui/79040.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0369]: cannot add `{integer}` to `&str`
-  --> $DIR/79040.rs:2:25
-   |
-LL |     const FOO = "hello" + 1;
-   |                 ------- ^ - {integer}
-   |                 |
-   |                 &str
-
-error[E0369]: cannot add `{integer}` to `&str`
-  --> $DIR/79040.rs:2:25
-   |
-LL |     const FOO = "hello" + 1;
-   |                 ------- ^ - {integer}
-   |                 |
-   |                 &str
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs b/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
index 613b3c98561..15a15a207b1 100644
--- a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
+++ b/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
@@ -4,4 +4,3 @@ fn main() {}
 
 const A: u8; //~ ERROR free constant item without body
 const B; //~ ERROR free constant item without body
-//~^ ERROR missing type for `const` item
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs b/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
index 780479e3d26..61d3eab24d8 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
+++ b/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
@@ -4,8 +4,6 @@ fn main() {}
 
 static A: u8; //~ ERROR free static item without body
 static B; //~ ERROR free static item without body
-//~^ ERROR missing type for `static` item
 
 static mut C: u8; //~ ERROR free static item without body
 static mut D; //~ ERROR free static item without body
-//~^ ERROR missing type for `static mut` item
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr b/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
index 2a270c8290f..7b408323674 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
+++ b/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
@@ -15,7 +15,7 @@ LL | static B;
    |         help: provide a definition for the static: `= <expr>;`
 
 error: free static item without body
-  --> $DIR/item-free-static-no-body-semantic-fail.rs:9:1
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:8:1
    |
 LL | static mut C: u8;
    | ^^^^^^^^^^^^^^^^-
@@ -23,7 +23,7 @@ LL | static mut C: u8;
    |                 help: provide a definition for the static: `= <expr>;`
 
 error: free static item without body
-  --> $DIR/item-free-static-no-body-semantic-fail.rs:10:1
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:9:1
    |
 LL | static mut D;
    | ^^^^^^^^^^^^-
diff --git a/src/test/ui/typeck/issue-79040.rs b/src/test/ui/typeck/issue-79040.rs
new file mode 100644
index 00000000000..af2a9c1ba87
--- /dev/null
+++ b/src/test/ui/typeck/issue-79040.rs
@@ -0,0 +1,5 @@
+fn main() {
+    const FOO = "hello" + 1; //~ ERROR cannot add `{integer}` to `&str`
+    //~^ ERROR cannot add `{integer}` to `&str`
+    println!("{}", FOO);
+}
diff --git a/src/test/ui/typeck/issue-79040.stderr b/src/test/ui/typeck/issue-79040.stderr
new file mode 100644
index 00000000000..32049e5d968
--- /dev/null
+++ b/src/test/ui/typeck/issue-79040.stderr
@@ -0,0 +1,19 @@
+error[E0369]: cannot add `{integer}` to `&str`
+  --> $DIR/issue-79040.rs:2:25
+   |
+LL |     const FOO = "hello" + 1;
+   |                 ------- ^ - {integer}
+   |                 |
+   |                 &str
+
+error[E0369]: cannot add `{integer}` to `&str`
+  --> $DIR/issue-79040.rs:2:25
+   |
+LL |     const FOO = "hello" + 1;
+   |                 ------- ^ - {integer}
+   |                 |
+   |                 &str
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0369`.
-- 
cgit 1.4.1-3-g733a5