Skip to content

Commit 02f93ca

Browse files
committed
Emit a better error for attempted unsafe-pointer-self. Close rust-lang#8306.
1 parent e9f6f3f commit 02f93ca

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,6 +3571,19 @@ impl Parser {
35713571
self.bump();
35723572
sty_value
35733573
}
3574+
token::BINOP(token::STAR) => {
3575+
// Possibly "*self" or "*mut self" -- not supported. Try to avoid
3576+
// emitting cryptic "unexpected token" errors.
3577+
self.bump();
3578+
if self.token_is_mutability(self.token) {
3579+
self.bump();
3580+
}
3581+
if self.is_self_ident() {
3582+
self.span_err(*self.span, "cannot pass self by unsafe pointer");
3583+
self.bump();
3584+
}
3585+
sty_value
3586+
}
35743587
_ => {
35753588
sty_static
35763589
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
trait A {
12+
fn foo(*mut self); //~ ERROR cannot pass self by unsafe pointer
13+
fn bar(*self); //~ ERROR cannot pass self by unsafe pointer
14+
}
15+
16+
struct X;
17+
impl A for X {
18+
fn foo(*mut self) { } //~ ERROR cannot pass self by unsafe pointer
19+
fn bar(*self) { } //~ ERROR cannot pass self by unsafe pointer
20+
}
21+
22+
fn main() { }

0 commit comments

Comments
 (0)