From 3d50ad733229ecc9a8412cf372370aa0be1213d8 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 12 Apr 2016 13:33:28 -0700 Subject: Bare raw pointers have been disallowed forever This change was in 0.12.0, a year and a half ago. Let's move on! --- src/libsyntax/parse/parser.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index c4997348537..183329ba474 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1532,9 +1532,8 @@ impl<'a> Parser<'a> { } else { let span = self.last_span; self.span_err(span, - "bare raw pointers are no longer allowed, you should \ - likely use `*mut T`, but otherwise `*T` is now \ - known as `*const T`"); + "bare raw pointers are not allowed, use `*mut T` or \ + `*const T` as appropriate"); Mutability::Immutable }; let t = self.parse_ty()?; -- cgit 1.4.1-3-g733a5 From 222f47a578887cf863bd51b508dbfe313cff2ab1 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 14 Apr 2016 09:46:27 -0700 Subject: Improve message for raw pointer missing mut and const "Bare raw pointer" does not exist as a concept. --- src/libsyntax/parse/parser.rs | 4 ++-- src/test/parse-fail/bad-pointer-type.rs | 15 +++++++++++++++ src/test/parse-fail/bare-raw-pointer.rs | 15 --------------- 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 src/test/parse-fail/bad-pointer-type.rs delete mode 100644 src/test/parse-fail/bare-raw-pointer.rs (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 183329ba474..f41aa835a75 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1532,8 +1532,8 @@ impl<'a> Parser<'a> { } 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 index 00000000000..cdb4d16fed2 --- /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 or the MIT license +// , 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 index d6d1e2d9c4f..00000000000 --- 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 or the MIT license -// , 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 -} -- cgit 1.4.1-3-g733a5