bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #63543 - c410-f3r:variant, r=c410-f3r

Browse source 
Merge Variant and Variant_

Extracted from #63468.
This commit is contained in:
Mazdak Farrokhzad 2019-08-14 22:56:29 +02:00 • committed by GitHub
commit ad44d42750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 162 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/ast.rs
View file

@ -2041,7 +2041,7 @@ pub struct EnumDef {
}
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct Variant_ {
pub struct Variant {
/// Name of the variant.
pub ident: Ident,
/// Attributes of the variant.
@ -2052,10 +2052,10 @@ pub struct Variant_ {
pub data: VariantData,
/// Explicit discriminant, e.g., `Foo = 1`.
pub disr_expr: Option<AnonConst>,
/// Span
pub span: Span,
}
pub type Variant = Spanned<Variant_>;
/// Part of `use` item to the right of its prefix.
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub enum UseTreeKind {