about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2020-10-29 08:26:42 -0700
committerEsteban Küber <esteban@kuber.com.ar>2020-10-29 08:26:42 -0700
commitf9a26643ecd72cf75d0d5b87c40979816fdaef22 (patch)
tree2ebe5b5634df25573b5748bd03078dacd0566814 /src
parent31ee872db5aae4750e3da1ca4ed1523c4356947f (diff)
downloadrust-f9a26643ecd72cf75d0d5b87c40979816fdaef22.tar.gz
rust-f9a26643ecd72cf75d0d5b87c40979816fdaef22.zip
Revert invalid `fn` return type parsing change
Fix #78507.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/parser/issue-24780.rs4
-rw-r--r--src/test/ui/parser/issue-24780.stderr4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/parser/issue-24780.rs b/src/test/ui/parser/issue-24780.rs
index 20665b549d2..480d9bc2bad 100644
--- a/src/test/ui/parser/issue-24780.rs
+++ b/src/test/ui/parser/issue-24780.rs
@@ -1,8 +1,8 @@
 // Verify that '>' is not both expected and found at the same time, as it used
 // to happen in #24780. For example, following should be an error:
-// expected one of ..., `>`, ... found `>`. No longer exactly this, but keeping for posterity.
+// expected one of ..., `>`, ... found `>`.
 
-fn foo() -> Vec<usize>> { //~ ERROR unmatched angle bracket
+fn foo() -> Vec<usize>> { //~ ERROR expected one of `!`, `+`, `::`, `;`, `where`, or `{`, found `>`
     Vec::new()
 }
 
diff --git a/src/test/ui/parser/issue-24780.stderr b/src/test/ui/parser/issue-24780.stderr
index d12b13d35f8..bdd089bb7a1 100644
--- a/src/test/ui/parser/issue-24780.stderr
+++ b/src/test/ui/parser/issue-24780.stderr
@@ -1,8 +1,8 @@
-error: unmatched angle bracket
+error: expected one of `!`, `+`, `::`, `;`, `where`, or `{`, found `>`
   --> $DIR/issue-24780.rs:5:23
    |
 LL | fn foo() -> Vec<usize>> {
-   |                       ^^ help: remove extra angle bracket
+   |                       ^ expected one of `!`, `+`, `::`, `;`, `where`, or `{`
 
 error: aborting due to previous error