OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

librustc: Don't require the "static" keyword to define a static method

Browse Source
This commit is contained in:
Patrick Walton 2013-03-12 22:36:46 -07:00
parent ac60d53c65
commit 2ccc6e0a57
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libsyntax/parse/parser.rs
View File

@ -469,11 +469,11 @@ pub impl Parser {
either::Left(p.parse_arg_general(false)) either::Left(p.parse_arg_general(false))
}; };
// XXX: Wrong. Shouldn't allow both static and self_ty // XXX: Wrong. Shouldn't allow both static and self_ty
let self_ty = if is_static { static_sty } else { self_ty }; let self_ty = if is_static || self_ty.node == sty_by_ref {
static_sty
if self_ty.node == sty_by_ref { } else {
self.obsolete(self_ty.span, ObsoleteImplicitSelf); self_ty
} };
let hi = p.last_span.hi; let hi = p.last_span.hi;
debug!("parse_trait_methods(): trait method signature ends in \ debug!("parse_trait_methods(): trait method signature ends in \
@ -2983,11 +2983,11 @@ pub impl Parser {
p.parse_arg() p.parse_arg()
}; };
// XXX: interaction between staticness, self_ty is broken now // XXX: interaction between staticness, self_ty is broken now
let self_ty = if is_static { static_sty} else { self_ty }; let self_ty = if is_static || self_ty.node == sty_by_ref {
static_sty
if self_ty.node == sty_by_ref { } else {
self.obsolete(self_ty.span, ObsoleteImplicitSelf); self_ty
} };
let (inner_attrs, body) = self.parse_inner_attrs_and_block(true); let (inner_attrs, body) = self.parse_inner_attrs_and_block(true);
let hi = body.span.hi; let hi = body.span.hi;