diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-16 19:17:40 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-16 19:17:40 +0100 |
commit | 2a704035f4b36a0db737f59a7c939d17656b516f (patch) | |
tree | a71246cfffb870ec54a7d4e8587991e173a4c0e8 /crates | |
parent | 06ab643b007592a7f76309e3c9cb2e715e211a96 (diff) | |
parent | 2f4a248f806e8587a21c52e636e6fe68eb9bfdbb (diff) |
Merge #137
137: rename gen-kinds to gen-syntax r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_syntax/src/ast/generated.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/generated.rs.tera | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/syntax_kinds/generated.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/syntax_kinds/generated.rs.tera | 2 | ||||
-rw-r--r-- | crates/tools/src/main.rs | 4 | ||||
-rw-r--r-- | crates/tools/tests/cli.rs | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs index a15e00176..98c7de361 100644 --- a/crates/ra_syntax/src/ast/generated.rs +++ b/crates/ra_syntax/src/ast/generated.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | // This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-kinds` is run | 1 | // This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-syntax` is run |
2 | // Do not edit manually | 2 | // Do not edit manually |
3 | 3 | ||
4 | #![cfg_attr(rustfmt, rustfmt_skip)] | 4 | #![cfg_attr(rustfmt, rustfmt_skip)] |
diff --git a/crates/ra_syntax/src/ast/generated.rs.tera b/crates/ra_syntax/src/ast/generated.rs.tera index d2a281137..e1404deac 100644 --- a/crates/ra_syntax/src/ast/generated.rs.tera +++ b/crates/ra_syntax/src/ast/generated.rs.tera | |||
@@ -1,6 +1,6 @@ | |||
1 | {# THIS File is not automatically generated: | 1 | {# THIS File is not automatically generated: |
2 | the below applies to the result of this template | 2 | the below applies to the result of this template |
3 | #}// This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-kinds` is run | 3 | #}// This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-syntax` is run |
4 | // Do not edit manually | 4 | // Do not edit manually |
5 | 5 | ||
6 | #![cfg_attr(rustfmt, rustfmt_skip)] | 6 | #![cfg_attr(rustfmt, rustfmt_skip)] |
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index ea8063d3b..0830e02f2 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -1,5 +1,5 @@ | |||
1 | // Stores definitions which must be used in multiple places | 1 | // Stores definitions which must be used in multiple places |
2 | // See `cargo gen-kinds` (defined in crates/tools/src/main.rs) | 2 | // See `cargo gen-syntax` (defined in crates/tools/src/main.rs) |
3 | Grammar( | 3 | Grammar( |
4 | single_byte_tokens: [ | 4 | single_byte_tokens: [ |
5 | [";", "SEMI"], | 5 | [";", "SEMI"], |
diff --git a/crates/ra_syntax/src/syntax_kinds/generated.rs b/crates/ra_syntax/src/syntax_kinds/generated.rs index 11e9150bb..58e2e9e9c 100644 --- a/crates/ra_syntax/src/syntax_kinds/generated.rs +++ b/crates/ra_syntax/src/syntax_kinds/generated.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | // This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-kinds` is run | 1 | // This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-syntax` is run |
2 | // Do not edit manually | 2 | // Do not edit manually |
3 | 3 | ||
4 | #![allow(bad_style, missing_docs, unreachable_pub)] | 4 | #![allow(bad_style, missing_docs, unreachable_pub)] |
diff --git a/crates/ra_syntax/src/syntax_kinds/generated.rs.tera b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera index 018564b8a..c37e57702 100644 --- a/crates/ra_syntax/src/syntax_kinds/generated.rs.tera +++ b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera | |||
@@ -1,6 +1,6 @@ | |||
1 | {# THIS File is not automatically generated: | 1 | {# THIS File is not automatically generated: |
2 | the below applies to the result of this template | 2 | the below applies to the result of this template |
3 | #}// This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-kinds` is run | 3 | #}// This file is automatically generated based on the file `./generated.rs.tera` when `cargo gen-syntax` is run |
4 | // Do not edit manually | 4 | // Do not edit manually |
5 | 5 | ||
6 | #![allow(bad_style, missing_docs, unreachable_pub)] | 6 | #![allow(bad_style, missing_docs, unreachable_pub)] |
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs index 965bc7729..152298014 100644 --- a/crates/tools/src/main.rs +++ b/crates/tools/src/main.rs | |||
@@ -28,7 +28,7 @@ fn main() -> Result<()> { | |||
28 | .help("Verify that generated code is up-to-date") | 28 | .help("Verify that generated code is up-to-date") |
29 | .global(true), | 29 | .global(true), |
30 | ) | 30 | ) |
31 | .subcommand(SubCommand::with_name("gen-kinds")) | 31 | .subcommand(SubCommand::with_name("gen-syntax")) |
32 | .subcommand(SubCommand::with_name("gen-tests")) | 32 | .subcommand(SubCommand::with_name("gen-tests")) |
33 | .subcommand(SubCommand::with_name("install-code")) | 33 | .subcommand(SubCommand::with_name("install-code")) |
34 | .get_matches(); | 34 | .get_matches(); |
@@ -40,7 +40,7 @@ fn main() -> Result<()> { | |||
40 | match matches.subcommand() { | 40 | match matches.subcommand() { |
41 | ("install-code", _) => install_code_extension()?, | 41 | ("install-code", _) => install_code_extension()?, |
42 | ("gen-tests", _) => gen_tests(mode)?, | 42 | ("gen-tests", _) => gen_tests(mode)?, |
43 | ("gen-kinds", _) => generate(Overwrite)?, | 43 | ("gen-syntax", _) => generate(Overwrite)?, |
44 | _ => unreachable!(), | 44 | _ => unreachable!(), |
45 | } | 45 | } |
46 | Ok(()) | 46 | Ok(()) |
diff --git a/crates/tools/tests/cli.rs b/crates/tools/tests/cli.rs index 0bb5d15d8..5de52fc2b 100644 --- a/crates/tools/tests/cli.rs +++ b/crates/tools/tests/cli.rs | |||
@@ -7,6 +7,6 @@ use tools::{ | |||
7 | #[test] | 7 | #[test] |
8 | fn verify_template_generation() { | 8 | fn verify_template_generation() { |
9 | if let Err(error) = generate(Verify) { | 9 | if let Err(error) = generate(Verify) { |
10 | panic!("{}. Please update it by running `cargo gen-kinds`", error); | 10 | panic!("{}. Please update it by running `cargo gen-syntax`", error); |
11 | } | 11 | } |
12 | } | 12 | } |