diff options
| author | bors <bors@rust-lang.org> | 2017-01-12 20:44:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-12 20:44:02 +0000 |
| commit | e35717814686ea3e3d44a8f5c1c20d1cd50be82a (patch) | |
| tree | 1b4d764f36a18863999d7c2f5b4f3642d63b837f /src/libsyntax/parse/parser.rs | |
| parent | 27b9e6d450590751fca863312a8cf10f289cf1f2 (diff) | |
| parent | 7972c1905beb9d1169475f42231b25d0bc9e83e6 (diff) | |
| download | rust-e35717814686ea3e3d44a8f5c1c20d1cd50be82a.tar.gz rust-e35717814686ea3e3d44a8f5c1c20d1cd50be82a.zip | |
Auto merge of #38814 - Ralith:cfg-fields, r=jseyfried
syntax: enable attributes and cfg on struct fields
This enables conditional compilation of field initializers in a struct literal, simplifying construction of structs whose fields are themselves conditionally present. For example, the intializer for the constant in the following becomes legal, and has the intuitive effect:
```rust
struct Foo {
#[cfg(unix)]
bar: (),
}
const FOO: Foo = Foo {
#[cfg(unix)]
bar: (),
};
```
It's not clear to me whether this calls for the full RFC process, but the implementation was simple enough that I figured I'd begin the conversation with code.
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 2bb38433a26..167fa78d7e0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1946,6 +1946,7 @@ impl<'a> Parser<'a> { /// Parse ident (COLON expr)? pub fn parse_field(&mut self) -> PResult<'a, Field> { + let attrs = self.parse_outer_attributes()?; let lo = self.span.lo; let hi; @@ -1968,6 +1969,7 @@ impl<'a> Parser<'a> { span: mk_sp(lo, expr.span.hi), expr: expr, is_shorthand: is_shorthand, + attrs: attrs.into(), }) } @@ -3436,6 +3438,7 @@ impl<'a> Parser<'a> { if self.check(&token::CloseDelim(token::Brace)) { break } } + let attrs = self.parse_outer_attributes()?; let lo = self.span.lo; let hi; @@ -3493,9 +3496,13 @@ impl<'a> Parser<'a> { }; fields.push(codemap::Spanned { span: mk_sp(lo, hi), - node: ast::FieldPat { ident: fieldname, - pat: subpat, - is_shorthand: is_shorthand }}); + node: ast::FieldPat { + ident: fieldname, + pat: subpat, + is_shorthand: is_shorthand, + attrs: attrs.into(), + } + }); } return Ok((fields, etc)); } |
