From 73315c9168901ef6d676f017daaa9b4976380c03 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 15 Aug 2020 01:43:34 +0700 Subject: synchronizing changes --- xtask/src/codegen.rs | 8 ++++---- xtask/src/codegen/gen_unstable_future_descriptor.rs | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'xtask') 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::{ // Directory used by xtask const STORAGE: &str = ".xtask"; -const GRAMMAR_DIR: &str = "crates/ra_parser/src/grammar"; -const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok"; -const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err"; +const GRAMMAR_DIR: &str = "crates/parser/src/grammar"; +const OK_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/ok"; +const ERR_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/err"; const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs"; const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs"; @@ -41,7 +41,7 @@ const ASSISTS_DIR: &str = "crates/assists/src/handlers"; const ASSISTS_TESTS: &str = "crates/assists/src/tests/generated.rs"; const REPOSITORY_URL: &str = "https://github.com/rust-lang/rust"; -const UNSTABLE_FEATURE: &str = "crates/ra_ide/src/completion/unstable_feature_descriptor.rs"; +const UNSTABLE_FEATURE: &str = "crates/ide/src/completion/unstable_feature_descriptor.rs"; const REPO_PATH: &str = "src/doc/unstable-book/src"; #[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 { .filter_map(|e| e.ok()) .filter(|entry| { // Get all `.md ` files - entry.file_type().is_file() - && entry.path().extension().unwrap_or_default() == "md" + entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md" }) .collect::>(); -- cgit v1.2.3