diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 17:31:42 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 17:31:42 +0100 |
commit | d583f2c46d22cf8d643ebf98be9cb7059a304431 (patch) | |
tree | 9d898eb9600b0c36a74e4f95238f679c683fa566 /xtask/src | |
parent | 3d6889cba72a9d02199f7adaa2ecc69bc30af834 (diff) | |
parent | a1c187eef3ba08076aedb5154929f7eda8d1b424 (diff) |
Merge #5729
5729: Rename ra_syntax -> syntax
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/codegen.rs | 8 | ||||
-rw-r--r-- | xtask/src/codegen/gen_syntax.rs | 2 | ||||
-rw-r--r-- | xtask/src/lib.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs index 08e7a10b7..2acd598d1 100644 --- a/xtask/src/codegen.rs +++ b/xtask/src/codegen.rs | |||
@@ -25,12 +25,12 @@ pub use self::{ | |||
25 | }; | 25 | }; |
26 | 26 | ||
27 | const GRAMMAR_DIR: &str = "crates/parser/src/grammar"; | 27 | const GRAMMAR_DIR: &str = "crates/parser/src/grammar"; |
28 | const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok"; | 28 | const OK_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/ok"; |
29 | const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err"; | 29 | const ERR_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/err"; |
30 | 30 | ||
31 | const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs"; | 31 | const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs"; |
32 | const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs"; | 32 | const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs"; |
33 | const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs"; | 33 | const AST_TOKENS: &str = "crates/syntax/src/ast/generated/tokens.rs"; |
34 | 34 | ||
35 | const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers"; | 35 | const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers"; |
36 | const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs"; | 36 | const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs"; |
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index cafad8070..dd1f4d6a2 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | //! This module generates AST datatype used by rust-analyzer. | 1 | //! This module generates AST datatype used by rust-analyzer. |
2 | //! | 2 | //! |
3 | //! Specifically, it generates the `SyntaxKind` enum and a number of newtype | 3 | //! Specifically, it generates the `SyntaxKind` enum and a number of newtype |
4 | //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`. | 4 | //! wrappers around `SyntaxNode` which implement `syntax::AstNode`. |
5 | 5 | ||
6 | use std::{ | 6 | use std::{ |
7 | collections::{BTreeSet, HashSet}, | 7 | collections::{BTreeSet, HashSet}, |
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 2fdb08f2e..904a9ee71 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -103,7 +103,7 @@ pub fn run_clippy() -> Result<()> { | |||
103 | } | 103 | } |
104 | 104 | ||
105 | pub fn run_fuzzer() -> Result<()> { | 105 | pub fn run_fuzzer() -> Result<()> { |
106 | let _d = pushd("./crates/ra_syntax"); | 106 | let _d = pushd("./crates/syntax"); |
107 | let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); | 107 | let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); |
108 | if run!("cargo fuzz --help").is_err() { | 108 | if run!("cargo fuzz --help").is_err() { |
109 | run!("cargo install cargo-fuzz")?; | 109 | run!("cargo install cargo-fuzz")?; |