diff options
| author | bors <bors@rust-lang.org> | 2015-06-10 18:41:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-10 18:41:42 +0000 |
| commit | ae8a3c92a77e9295a764fc98998245aa1e0336b1 (patch) | |
| tree | bfd4ea2a05ff2b50273142c85cf301efc39af78d /src/libsyntax | |
| parent | d8a9570154dfbc4032cb3a6ba8b51c6256518dcd (diff) | |
| parent | c8519c9793128cb15b91498cda9a90d948d53da3 (diff) | |
| download | rust-ae8a3c92a77e9295a764fc98998245aa1e0336b1.tar.gz rust-ae8a3c92a77e9295a764fc98998245aa1e0336b1.zip | |
Auto merge of #26182 - Manishearth:rollup, r=Manishearth
- Successful merges: #26142, #26143, #26145, #26146, #26164, #26174 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index dcf6667b606..32066b74413 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4215,7 +4215,7 @@ impl<'a> Parser<'a> { }; if self.is_self_ident() { let span = self.span; - self.span_err(span, "cannot pass self by unsafe pointer"); + self.span_err(span, "cannot pass self by raw pointer"); try!(self.bump()); } // error case, making bogus self ident: |