diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-06 23:43:24 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-01-06 23:43:24 +0000 |
commit | 7b9df1062d65e6977f16d6595ffb5912769011a3 (patch) | |
tree | 8a9535261dac04f171caa68d4b908cdde0b4a34c /xtask | |
parent | c92a090f49cad2fa540562536f07fcb619f16680 (diff) | |
parent | ce1b34fd59a6145a4bb5682d672c846e101725d4 (diff) |
Merge #2724
2724: Improve const generic parsing r=matklad a=mchesser
Add support for generic arguments in:
`impl` type parameters:
```rust
impl<const N: u32> Bar<N> {}
```
type args:
```rust
type A = B<1, { 2 }>;
test::<10>();
```
Co-authored-by: Michael Chesser <[email protected]>
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/ast_src.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index d494a4a38..67d1f41bc 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs | |||
@@ -206,6 +206,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { | |||
206 | "LIFETIME_ARG", | 206 | "LIFETIME_ARG", |
207 | "TYPE_ARG", | 207 | "TYPE_ARG", |
208 | "ASSOC_TYPE_ARG", | 208 | "ASSOC_TYPE_ARG", |
209 | "CONST_ARG", | ||
209 | "PARAM_LIST", | 210 | "PARAM_LIST", |
210 | "PARAM", | 211 | "PARAM", |
211 | "SELF_PARAM", | 212 | "SELF_PARAM", |
@@ -511,10 +512,12 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
511 | type_args: [TypeArg], | 512 | type_args: [TypeArg], |
512 | lifetime_args: [LifetimeArg], | 513 | lifetime_args: [LifetimeArg], |
513 | assoc_type_args: [AssocTypeArg], | 514 | assoc_type_args: [AssocTypeArg], |
515 | const_arg: [ConstArg], | ||
514 | } | 516 | } |
515 | struct TypeArg { TypeRef } | 517 | struct TypeArg { TypeRef } |
516 | struct AssocTypeArg { NameRef, TypeRef } | 518 | struct AssocTypeArg { NameRef, TypeRef } |
517 | struct LifetimeArg {} | 519 | struct LifetimeArg {} |
520 | struct ConstArg { Literal, BlockExpr } | ||
518 | 521 | ||
519 | struct MacroItems: ModuleItemOwner, FnDefOwner { } | 522 | struct MacroItems: ModuleItemOwner, FnDefOwner { } |
520 | 523 | ||