aboutsummaryrefslogtreecommitdiff
path: root/xtask
diff options
context:
space:
mode:
authorDmitry <[email protected]>2020-08-14 19:43:34 +0100
committerDmitry <[email protected]>2020-08-14 20:37:43 +0100
commit73315c9168901ef6d676f017daaa9b4976380c03 (patch)
tree0fae548ddc8dbf3fdfd553e4020db8e6826c8d84 /xtask
parent178c3e135a2a249692f7784712492e7884ae0c00 (diff)
synchronizing changes
Diffstat (limited to 'xtask')
-rw-r--r--xtask/src/codegen.rs8
-rw-r--r--xtask/src/codegen/gen_unstable_future_descriptor.rs3
2 files changed, 5 insertions, 6 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index 950dd61b2..4b2b614fa 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -29,9 +29,9 @@ pub use self::{
29// Directory used by xtask 29// Directory used by xtask
30const STORAGE: &str = ".xtask"; 30const STORAGE: &str = ".xtask";
31 31
32const GRAMMAR_DIR: &str = "crates/ra_parser/src/grammar"; 32const GRAMMAR_DIR: &str = "crates/parser/src/grammar";
33const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok"; 33const OK_INLINE_TESTS_DIR: &str = "crates/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/syntax/test_data/parser/inline/err";
35 35
36const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs"; 36const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs";
37const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs"; 37const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs";
@@ -41,7 +41,7 @@ const ASSISTS_DIR: &str = "crates/assists/src/handlers";
41const ASSISTS_TESTS: &str = "crates/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/ide/src/completion/unstable_feature_descriptor.rs";
45const REPO_PATH: &str = "src/doc/unstable-book/src"; 45const REPO_PATH: &str = "src/doc/unstable-book/src";
46 46
47#[derive(Debug, PartialEq, Eq, Clone, Copy)] 47#[derive(Debug, PartialEq, Eq, Clone, Copy)]
diff --git a/xtask/src/codegen/gen_unstable_future_descriptor.rs b/xtask/src/codegen/gen_unstable_future_descriptor.rs
index 3f3beb591..f220f85d3 100644
--- a/xtask/src/codegen/gen_unstable_future_descriptor.rs
+++ b/xtask/src/codegen/gen_unstable_future_descriptor.rs
@@ -15,8 +15,7 @@ fn generate_descriptor(src_dir: PathBuf) -> Result<TokenStream> {
15 .filter_map(|e| e.ok()) 15 .filter_map(|e| e.ok())
16 .filter(|entry| { 16 .filter(|entry| {
17 // Get all `.md ` files 17 // Get all `.md ` files
18 entry.file_type().is_file() 18 entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md"
19 && entry.path().extension().unwrap_or_default() == "md"
20 }) 19 })
21 .collect::<Vec<_>>(); 20 .collect::<Vec<_>>();
22 21