aboutsummaryrefslogtreecommitdiff
path: root/xtask/src
diff options
context:
space:
mode:
Diffstat (limited to 'xtask/src')
-rw-r--r--xtask/src/codegen.rs10
-rw-r--r--xtask/src/codegen/gen_syntax.rs2
-rw-r--r--xtask/src/lib.rs4
3 files changed, 8 insertions, 8 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index 1edb04c2f..950dd61b2 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -33,12 +33,12 @@ const GRAMMAR_DIR: &str = "crates/ra_parser/src/grammar";
33const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok"; 33const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok";
34const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err"; 34const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err";
35 35
36const SYNTAX_KINDS: &str = "crates/ra_parser/src/syntax_kind/generated.rs"; 36const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs";
37const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs"; 37const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs";
38const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs"; 38const AST_TOKENS: &str = "crates/syntax/src/ast/generated/tokens.rs";
39 39
40const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers"; 40const ASSISTS_DIR: &str = "crates/assists/src/handlers";
41const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs"; 41const ASSISTS_TESTS: &str = "crates/assists/src/tests/generated.rs";
42 42
43const REPOSITORY_URL: &str = "https://github.com/rust-lang/rust"; 43const REPOSITORY_URL: &str = "https://github.com/rust-lang/rust";
44const UNSTABLE_FEATURE: &str = "crates/ra_ide/src/completion/unstable_feature_descriptor.rs"; 44const UNSTABLE_FEATURE: &str = "crates/ra_ide/src/completion/unstable_feature_descriptor.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
6use std::{ 6use std::{
7 collections::{BTreeSet, HashSet}, 7 collections::{BTreeSet, HashSet},
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 2fdb08f2e..807ef587c 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -103,7 +103,7 @@ pub fn run_clippy() -> Result<()> {
103} 103}
104 104
105pub fn run_fuzzer() -> Result<()> { 105pub 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")?;
@@ -139,7 +139,7 @@ pub fn run_pre_cache() -> Result<()> {
139 } 139 }
140 140
141 fs2::remove_file("./target/.rustc_info.json")?; 141 fs2::remove_file("./target/.rustc_info.json")?;
142 let to_delete = ["ra_", "heavy_test", "xtask"]; 142 let to_delete = ["hir", "heavy_test", "xtask", "ide", "rust-analyzer"];
143 for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() { 143 for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() {
144 for entry in Path::new(dir).read_dir()? { 144 for entry in Path::new(dir).read_dir()? {
145 let entry = entry?; 145 let entry = entry?;