bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove support for Self in attributes

Browse source
This commit is contained in:
Esteban Küber 2018-02-01 12:12:55 -08:00
parent f7c61783e4
commit 378e73e6db
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/traits/error_reporting.rs
View file

@ -372,9 +372,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
let generics = self.tcx.generics_of(def_id);
let self_ty = trait_ref.self_ty();
let self_ty_str = self_ty.to_string();
// FIXME: remove once `Self` is accepted by the compiler
flags.push(("_Self".to_string(), Some(self_ty_str.clone())));
flags.push(("Self".to_string(), Some(self_ty_str.clone())));
for param in generics.types.iter() {
let name = param.name.as_str().to_string();

8
src/libsyntax/parse/parser.rs
View file

@ -778,13 +778,7 @@ impl<'a> Parser<'a> {
}
pub fn parse_ident_attr(&mut self) -> PResult<'a, ast::Ident> {
match self.token {
token::Ident(i) if i.name == keywords::SelfType.name() => {
self.bump();
Ok(i)
}
_ => self.parse_ident(),
}
self.parse_ident()
}
fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {