Improve message for raw pointer missing mut and const

"Bare raw pointer" does not exist as a concept.

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 183329ba474868496d0b8f38c53a3800005f177d..f41aa835a753b5d0d89dac152875ad5e18976d2d 100644 (file)
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1532,8 +1532,8 @@ pub fn parse_ptr(&mut self) -> PResult<'a, MutTy> {
         } else {
             let span = self.last_span;
             self.span_err(span,
-                          "bare raw pointers are not allowed, use `*mut T` or \
-                           `*const T` as appropriate");
+                          "expected mut or const in raw pointer type (use \
+                           `*mut T` or `*const T` as appropriate)");
             Mutability::Immutable
         };
         let t = self.parse_ty()?;

diff --git a/src/test/parse-fail/bad-pointer-type.rs b/src/test/parse-fail/bad-pointer-type.rs
new file mode 100644 (file)
index 0000000..cdb4d16
--- /dev/null
+++ b/src/test/parse-fail/bad-pointer-type.rs
@@ -0,0 +1,15 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z parse-only
+
+fn foo(_: *()) {
+    //~^ expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
+}

diff --git a/src/test/parse-fail/bare-raw-pointer.rs b/src/test/parse-fail/bare-raw-pointer.rs
deleted file mode 100644 (file)
index d6d1e2d..0000000
--- a/src/test/parse-fail/bare-raw-pointer.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: -Z parse-only
-
-fn foo(_: *()) {
-    //~^ bare raw pointers are not allowed, use `*mut T` or `*const T` as appropriate
-}