bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Auto merge of #29303 - petrochenkov:unistrimp, r=eddyb

Browse source 
And use `VariantData` instead of `P<VariantData>` in `Item_` and `Variant_`

Improvements suggested by @eddyb in https://github.com/rust-lang/rust/pull/28816#discussion_r42483587 and https://github.com/rust-lang/rust/pull/28816#discussion_r42483648

plugin-[breaking-change]

r? @eddyb
This commit is contained in:
bors 2015-10-26 08:27:59 +00:00
commit c44316d4a1
24 changed files with 90 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4678,9 +4678,7 @@ impl<'a> Parser<'a> {
name, found `{}`", token_str)))
};
Ok((class_name,
ItemStruct(P(vdata), generics),
None))
Ok((class_name, ItemStruct(vdata, generics), None))
}
pub fn parse_record_struct_body(&mut self) -> PResult<Vec<StructField>> {
@ -5111,14 +5109,14 @@ impl<'a> Parser<'a> {
/// Parse a structure-like enum variant definition
/// this should probably be renamed or refactored...
fn parse_struct_def(&mut self) -> PResult<P<VariantData>> {
fn parse_struct_def(&mut self) -> PResult<VariantData> {
let mut fields: Vec<StructField> = Vec::new();
while self.token != token::CloseDelim(token::Brace) {
fields.push(try!(self.parse_struct_decl_field(false)));
}
try!(self.bump());
Ok(P(VariantData::Struct(fields, ast::DUMMY_NODE_ID)))
Ok(VariantData::Struct(fields, ast::DUMMY_NODE_ID))
}
/// Parse the part of an "enum" decl following the '{'
@ -5154,13 +5152,13 @@ impl<'a> Parser<'a> {
id: ast::DUMMY_NODE_ID,
}});
}
struct_def = P(ast::VariantData::Tuple(fields, ast::DUMMY_NODE_ID));
struct_def = ast::VariantData::Tuple(fields, ast::DUMMY_NODE_ID);
} else if try!(self.eat(&token::Eq) ){
disr_expr = Some(try!(self.parse_expr_nopanic()));
any_disr = disr_expr.as_ref().map(|expr| expr.span);
struct_def = P(ast::VariantData::Unit(ast::DUMMY_NODE_ID));
struct_def = ast::VariantData::Unit(ast::DUMMY_NODE_ID);
} else {
struct_def = P(ast::VariantData::Unit(ast::DUMMY_NODE_ID));
struct_def = ast::VariantData::Unit(ast::DUMMY_NODE_ID);
}
let vr = ast::Variant_ {