about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlexis Bourget <alexis.bourget@gmail.com>2021-08-10 02:00:25 +0200
committerAlexis Bourget <alexis.bourget@gmail.com>2021-12-13 21:36:35 +0100
commit7bc8577d99d521ea600ede94f2a8ed3bcd6eb4fb (patch)
tree20ddaf12b4665a22b5a53d5b77e4ab80ee335476 /src
parent5cf96e70f49badf4a3085e80658a85e19ca4edda (diff)
downloadrust-7bc8577d99d521ea600ede94f2a8ed3bcd6eb4fb.tar.gz
rust-7bc8577d99d521ea600ede94f2a8ed3bcd6eb4fb.zip
Fix broken span and related tests
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/parser/duplicate-visibility.rs7
-rw-r--r--src/test/ui/parser/duplicate-visibility.stderr10
-rw-r--r--src/test/ui/parser/issue-87694-misplaced-pub.stderr5
3 files changed, 16 insertions, 6 deletions
diff --git a/src/test/ui/parser/duplicate-visibility.rs b/src/test/ui/parser/duplicate-visibility.rs
index 87ba230eab5..3da4dd28b6d 100644
--- a/src/test/ui/parser/duplicate-visibility.rs
+++ b/src/test/ui/parser/duplicate-visibility.rs
@@ -1,6 +1,9 @@
 fn main() {}
 
-extern "C" {
+extern "C" { //~ NOTE while parsing this item list starting here
     pub pub fn foo();
     //~^ ERROR expected one of `(`, `async`, `const`, `default`, `extern`, `fn`, `pub`, `unsafe`, or `use`, found keyword `pub`
-}
+    //~| NOTE expected one of 9 possible tokens
+    //~| HELP there is already a visibility, remove this one
+    //~| NOTE explicit visibility first seen here
+} //~ NOTE the item list ends here
diff --git a/src/test/ui/parser/duplicate-visibility.stderr b/src/test/ui/parser/duplicate-visibility.stderr
index d9815fc7395..b289f2d0adc 100644
--- a/src/test/ui/parser/duplicate-visibility.stderr
+++ b/src/test/ui/parser/duplicate-visibility.stderr
@@ -7,10 +7,16 @@ LL |     pub pub fn foo();
    |         ^^^
    |         |
    |         expected one of 9 possible tokens
-   |         help: visibility `pub` must come before `pub pub`: `pub pub pub`
-LL |
+   |         help: there is already a visibility, remove this one
+...
 LL | }
    | - the item list ends here
+   |
+note: explicit visibility first seen here
+  --> $DIR/duplicate-visibility.rs:4:5
+   |
+LL |     pub pub fn foo();
+   |     ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.stderr b/src/test/ui/parser/issue-87694-misplaced-pub.stderr
index ac588ad5a77..94c6a29efcb 100644
--- a/src/test/ui/parser/issue-87694-misplaced-pub.stderr
+++ b/src/test/ui/parser/issue-87694-misplaced-pub.stderr
@@ -2,8 +2,9 @@ error: expected one of `async`, `extern`, `fn`, or `unsafe`, found keyword `pub`
   --> $DIR/issue-87694-misplaced-pub.rs:1:7
    |
 LL | const pub fn test() {}
-   | ----- ^^^ expected one of `async`, `extern`, `fn`, or `unsafe`
-   | |
+   | ------^^^
+   | |     |
+   | |     expected one of `async`, `extern`, `fn`, or `unsafe`
    | help: visibility `pub` must come before `const`: `pub const`
 
 error: aborting due to previous error