about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-02 22:19:08 +0000
committerbors <bors@rust-lang.org>2017-06-02 22:19:08 +0000
commitbb907adbbd1727938245a67db1c92be7e4dec3e6 (patch)
treea6229fb68940fbe7bd2c7fae09b92fa10500c81d /src/test
parent107bd67ef7fb3e8027d7234d687cdd27c3efaa0d (diff)
parente05f1c12901e26f75a92f441f636942a8a3bf7c1 (diff)
downloadrust-bb907adbbd1727938245a67db1c92be7e4dec3e6.tar.gz
rust-bb907adbbd1727938245a67db1c92be7e4dec3e6.zip
Auto merge of #42381 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 10 pull requests

- Successful merges: #41981, #42225, #42310, #42319, #42335, #42343, #42355, #42360, #42370, #42372
- Failed merges:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/parse-fail/removed-syntax-extern-const.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/parse-fail/removed-syntax-extern-const.rs b/src/test/parse-fail/removed-syntax-extern-const.rs
index e632af6c83b..27688867de3 100644
--- a/src/test/parse-fail/removed-syntax-extern-const.rs
+++ b/src/test/parse-fail/removed-syntax-extern-const.rs
@@ -12,5 +12,5 @@
 
 extern {
     const i: isize;
-    //~^ ERROR expected one of `fn`, `pub`, `static`, or `}`, found `const`
+    //~^ ERROR extern items cannot be `const`
 }