Skip to content

Commit 8e83684

Browse files
committed
---
yaml --- r: 277113 b: refs/heads/try c: 222f47a h: refs/heads/master i: 277111: 5c985f7
1 parent 24d0fe9 commit 8e83684

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 3d50ad733229ecc9a8412cf372370aa0be1213d8
4+
refs/heads/try: 222f47a578887cf863bd51b508dbfe313cff2ab1
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,8 +1532,8 @@ impl<'a> Parser<'a> {
15321532
} else {
15331533
let span = self.last_span;
15341534
self.span_err(span,
1535-
"bare raw pointers are not allowed, use `*mut T` or \
1536-
`*const T` as appropriate");
1535+
"expected mut or const in raw pointer type (use \
1536+
`*mut T` or `*const T` as appropriate)");
15371537
Mutability::Immutable
15381538
};
15391539
let t = self.parse_ty()?;

branches/try/src/test/parse-fail/bare-raw-pointer.rs renamed to branches/try/src/test/parse-fail/bad-pointer-type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
// compile-flags: -Z parse-only
1212

1313
fn foo(_: *()) {
14-
//~^ bare raw pointers are not allowed, use `*mut T` or `*const T` as appropriate
14+
//~^ expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
1515
}

0 commit comments

Comments
 (0)