diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-15 14:48:21 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-15 14:48:21 +0000 |
commit | 0c58aa9dc0e24f0fa6a6ee7eb0c35041dedddb0a (patch) | |
tree | 863b6e41430b4d9f5c9dcebd443f4acdbe7e0193 /xtask | |
parent | d6a708b1eae170aee4a323ea6513bc4f2a1a5bbc (diff) | |
parent | 138514bea244253f2c0007976921f4475c9d2cd5 (diff) |
Merge #7209
7209: Support yield keyword r=Veykril a=sasurau4
Part of #4309
The inference of yield will be implemented at another PR.
Co-authored-by: Daiki Ihara <[email protected]>
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/Cargo.toml | 2 | ||||
-rw-r--r-- | xtask/src/ast_src.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 7a2937f0e..61a944c13 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml | |||
@@ -15,7 +15,7 @@ flate2 = "1.0" | |||
15 | pico-args = "0.3.1" | 15 | pico-args = "0.3.1" |
16 | proc-macro2 = "1.0.8" | 16 | proc-macro2 = "1.0.8" |
17 | quote = "1.0.2" | 17 | quote = "1.0.2" |
18 | ungrammar = "1.6" | 18 | ungrammar = "1.7" |
19 | walkdir = "2.3.1" | 19 | walkdir = "2.3.1" |
20 | write-json = "0.1.0" | 20 | write-json = "0.1.0" |
21 | xshell = "0.1" | 21 | xshell = "0.1" |
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index 2b8012bdd..046d68f52 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs | |||
@@ -68,7 +68,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { | |||
68 | "as", "async", "await", "box", "break", "const", "continue", "crate", "dyn", "else", | 68 | "as", "async", "await", "box", "break", "const", "continue", "crate", "dyn", "else", |
69 | "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "macro", | 69 | "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "macro", |
70 | "match", "mod", "move", "mut", "pub", "ref", "return", "self", "static", "struct", "super", | 70 | "match", "mod", "move", "mut", "pub", "ref", "return", "self", "static", "struct", "super", |
71 | "trait", "true", "try", "type", "unsafe", "use", "where", "while", | 71 | "trait", "true", "try", "type", "unsafe", "use", "where", "while", "yield", |
72 | ], | 72 | ], |
73 | contextual_keywords: &["auto", "default", "existential", "union", "raw", "macro_rules"], | 73 | contextual_keywords: &["auto", "default", "existential", "union", "raw", "macro_rules"], |
74 | literals: &["INT_NUMBER", "FLOAT_NUMBER", "CHAR", "BYTE", "STRING", "BYTE_STRING"], | 74 | literals: &["INT_NUMBER", "FLOAT_NUMBER", "CHAR", "BYTE", "STRING", "BYTE_STRING"], |
@@ -149,6 +149,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { | |||
149 | "LABEL", | 149 | "LABEL", |
150 | "BLOCK_EXPR", | 150 | "BLOCK_EXPR", |
151 | "RETURN_EXPR", | 151 | "RETURN_EXPR", |
152 | "YIELD_EXPR", | ||
152 | "MATCH_EXPR", | 153 | "MATCH_EXPR", |
153 | "MATCH_ARM_LIST", | 154 | "MATCH_ARM_LIST", |
154 | "MATCH_ARM", | 155 | "MATCH_ARM", |