diff options
| author | bors <bors@rust-lang.org> | 2016-09-22 13:11:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 13:11:04 -0700 |
| commit | 4c04e36f94c4b85b613a2d5fe5c9511053cbdec2 (patch) | |
| tree | f64b8be295c1dbf85c95dbf4411f1b8b9dcd0d88 /src/libsyntax/parse | |
| parent | 458f41121374291ac1c0d84dd24123d5edcb2967 (diff) | |
| parent | c1e39380fbb04691cdcf6c58e2c0054110fa698c (diff) | |
| download | rust-4c04e36f94c4b85b613a2d5fe5c9511053cbdec2.tar.gz rust-4c04e36f94c4b85b613a2d5fe5c9511053cbdec2.zip | |
Auto merge of #36651 - jonathandturner:rollup, r=jonathandturner
Rollup of 7 pull requests - Successful merges: #36330, #36423, #36539, #36571, #36589, #36600, #36632 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index a0defbc09dc..9eac024edb1 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -125,8 +125,8 @@ impl<'a> Parser<'a> { self.expect(&token::OpenDelim(token::Bracket))?; let meta_item = self.parse_meta_item()?; - let hi = self.last_span.hi; self.expect(&token::CloseDelim(token::Bracket))?; + let hi = self.last_span.hi; (mk_sp(lo, hi), meta_item, style) } |