about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser/generics.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-09 16:33:43 +0000
committerbors <bors@rust-lang.org>2019-09-09 16:33:43 +0000
commit0b36e9dea3f2ff25b1d0df2669836c33cce89ae5 (patch)
treee5e45ef04b46bdba8f8959029e7da415a58b0983 /src/libsyntax/parse/parser/generics.rs
parent45859b7ca764cafb14efb8c63a83d5e48dc5d016 (diff)
parentf7ee13040b66c323359c8aea139ba4d91db84376 (diff)
downloadrust-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/generics.rs')
-rw-r--r--src/libsyntax/parse/parser/generics.rs7
1 files changed, 5 insertions, 2 deletions
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.