diff options
| author | bors <bors@rust-lang.org> | 2019-09-09 16:33:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-09 16:33:43 +0000 |
| commit | 0b36e9dea3f2ff25b1d0df2669836c33cce89ae5 (patch) | |
| tree | e5e45ef04b46bdba8f8959029e7da415a58b0983 /src/libsyntax/parse/parser | |
| parent | 45859b7ca764cafb14efb8c63a83d5e48dc5d016 (diff) | |
| parent | f7ee13040b66c323359c8aea139ba4d91db84376 (diff) | |
| download | rust-0b36e9dea3f2ff25b1d0df2669836c33cce89ae5.tar.gz rust-0b36e9dea3f2ff25b1d0df2669836c33cce89ae5.zip | |
Auto merge of #64313 - Centril:rollup-7w8b67g, r=Centril
Rollup of 5 pull requests
Successful merges:
- #63468 (Resolve attributes in several places)
- #64121 (Override `StepBy::{try_fold, try_rfold}`)
- #64278 (check git in bootstrap.py)
- #64306 (Fix typo in config.toml.example)
- #64312 (Unify escape usage)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser')
| -rw-r--r-- | src/libsyntax/parse/parser/expr.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser/generics.rs | 7 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser/item.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser/pat.rs | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser/expr.rs b/src/libsyntax/parse/parser/expr.rs index 4dbb5ff75eb..31b28443abb 100644 --- a/src/libsyntax/parse/parser/expr.rs +++ b/src/libsyntax/parse/parser/expr.rs @@ -1193,7 +1193,8 @@ impl<'a> Parser<'a> { ty: t, pat, span, - id: DUMMY_NODE_ID + id: DUMMY_NODE_ID, + is_placeholder: false, }) } @@ -1455,6 +1456,7 @@ impl<'a> Parser<'a> { body: expr, span: lo.to(hi), id: DUMMY_NODE_ID, + is_placeholder: false, }) } @@ -1611,6 +1613,7 @@ impl<'a> Parser<'a> { is_shorthand: false, attrs: ThinVec::new(), id: DUMMY_NODE_ID, + is_placeholder: false, }); } } @@ -1697,6 +1700,7 @@ impl<'a> Parser<'a> { is_shorthand, attrs: attrs.into(), id: DUMMY_NODE_ID, + is_placeholder: false, }) } diff --git a/src/libsyntax/parse/parser/generics.rs b/src/libsyntax/parse/parser/generics.rs index 54f24f8ef2b..3e6118ad86f 100644 --- a/src/libsyntax/parse/parser/generics.rs +++ b/src/libsyntax/parse/parser/generics.rs @@ -49,7 +49,8 @@ impl<'a> Parser<'a> { bounds, kind: GenericParamKind::Type { default, - } + }, + is_placeholder: false }) } @@ -66,7 +67,8 @@ impl<'a> Parser<'a> { bounds: Vec::new(), kind: GenericParamKind::Const { ty, - } + }, + is_placeholder: false }) } @@ -90,6 +92,7 @@ impl<'a> Parser<'a> { attrs: attrs.into(), bounds, kind: ast::GenericParamKind::Lifetime, + is_placeholder: false }); } else if self.check_keyword(kw::Const) { // Parse const parameter. diff --git a/src/libsyntax/parse/parser/item.rs b/src/libsyntax/parse/parser/item.rs index be7fc48fdaf..baae6155f34 100644 --- a/src/libsyntax/parse/parser/item.rs +++ b/src/libsyntax/parse/parser/item.rs @@ -1575,6 +1575,7 @@ impl<'a> Parser<'a> { data: struct_def, disr_expr, span: vlo.to(self.prev_span), + is_placeholder: false, }; variants.push(vr); @@ -1730,6 +1731,7 @@ impl<'a> Parser<'a> { id: DUMMY_NODE_ID, ty, attrs, + is_placeholder: false, }) }).map(|(r, _)| r) } @@ -1821,6 +1823,7 @@ impl<'a> Parser<'a> { id: DUMMY_NODE_ID, ty, attrs, + is_placeholder: false, }) } diff --git a/src/libsyntax/parse/parser/pat.rs b/src/libsyntax/parse/parser/pat.rs index 49f8d58c6a7..08ee3a6bd86 100644 --- a/src/libsyntax/parse/parser/pat.rs +++ b/src/libsyntax/parse/parser/pat.rs @@ -882,6 +882,7 @@ impl<'a> Parser<'a> { attrs: attrs.into(), id: ast::DUMMY_NODE_ID, span: lo.to(hi), + is_placeholder: false, }) } |
