diff options
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/codegen.rs | 14 | ||||
-rw-r--r-- | xtask/src/codegen/gen_assists_docs.rs | 4 | ||||
-rw-r--r-- | xtask/src/codegen/gen_diagnostic_docs.rs | 2 | ||||
-rw-r--r-- | xtask/src/codegen/gen_feature_docs.rs | 2 | ||||
-rw-r--r-- | xtask/src/codegen/gen_features.rs | 48 | ||||
-rw-r--r-- | xtask/src/codegen/gen_lint_completions.rs | 68 | ||||
-rw-r--r-- | xtask/src/codegen/gen_parser_tests.rs | 2 | ||||
-rw-r--r-- | xtask/src/codegen/gen_syntax.rs | 2 | ||||
-rw-r--r-- | xtask/src/dist.rs | 8 | ||||
-rw-r--r-- | xtask/src/flags.rs | 139 | ||||
-rw-r--r-- | xtask/src/install.rs | 18 | ||||
-rw-r--r-- | xtask/src/lib.rs | 131 | ||||
-rw-r--r-- | xtask/src/main.rs | 273 | ||||
-rw-r--r-- | xtask/src/metrics.rs | 10 | ||||
-rw-r--r-- | xtask/src/pre_cache.rs | 6 | ||||
-rw-r--r-- | xtask/src/pre_commit.rs | 38 | ||||
-rw-r--r-- | xtask/src/release.rs | 18 | ||||
-rw-r--r-- | xtask/src/tidy.rs | 424 |
18 files changed, 782 insertions, 425 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs index adea053b6..2f56c5ad0 100644 --- a/xtask/src/codegen.rs +++ b/xtask/src/codegen.rs | |||
@@ -18,9 +18,9 @@ use std::{ | |||
18 | }; | 18 | }; |
19 | use xshell::{cmd, pushenv, read_file, write_file}; | 19 | use xshell::{cmd, pushenv, read_file, write_file}; |
20 | 20 | ||
21 | use crate::{ensure_rustfmt, project_root, Result}; | 21 | use crate::{ensure_rustfmt, flags, project_root, Result}; |
22 | 22 | ||
23 | pub use self::{ | 23 | pub(crate) use self::{ |
24 | gen_assists_docs::{generate_assists_docs, generate_assists_tests}, | 24 | gen_assists_docs::{generate_assists_docs, generate_assists_tests}, |
25 | gen_diagnostic_docs::generate_diagnostic_docs, | 25 | gen_diagnostic_docs::generate_diagnostic_docs, |
26 | gen_feature_docs::generate_feature_docs, | 26 | gen_feature_docs::generate_feature_docs, |
@@ -30,17 +30,13 @@ pub use self::{ | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | #[derive(Debug, PartialEq, Eq, Clone, Copy)] | 32 | #[derive(Debug, PartialEq, Eq, Clone, Copy)] |
33 | pub enum Mode { | 33 | pub(crate) enum Mode { |
34 | Overwrite, | 34 | Overwrite, |
35 | Verify, | 35 | Verify, |
36 | } | 36 | } |
37 | 37 | ||
38 | pub struct CodegenCmd { | 38 | impl flags::Codegen { |
39 | pub features: bool, | 39 | pub(crate) fn run(self) -> Result<()> { |
40 | } | ||
41 | |||
42 | impl CodegenCmd { | ||
43 | pub fn run(self) -> Result<()> { | ||
44 | if self.features { | 40 | if self.features { |
45 | generate_lint_completions(Mode::Overwrite)?; | 41 | generate_lint_completions(Mode::Overwrite)?; |
46 | } | 42 | } |
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs index 1ae1343a5..c469b388d 100644 --- a/xtask/src/codegen/gen_assists_docs.rs +++ b/xtask/src/codegen/gen_assists_docs.rs | |||
@@ -7,12 +7,12 @@ use crate::{ | |||
7 | project_root, rust_files_in, Result, | 7 | project_root, rust_files_in, Result, |
8 | }; | 8 | }; |
9 | 9 | ||
10 | pub fn generate_assists_tests(mode: Mode) -> Result<()> { | 10 | pub(crate) fn generate_assists_tests(mode: Mode) -> Result<()> { |
11 | let assists = Assist::collect()?; | 11 | let assists = Assist::collect()?; |
12 | generate_tests(&assists, mode) | 12 | generate_tests(&assists, mode) |
13 | } | 13 | } |
14 | 14 | ||
15 | pub fn generate_assists_docs(mode: Mode) -> Result<()> { | 15 | pub(crate) fn generate_assists_docs(mode: Mode) -> Result<()> { |
16 | let assists = Assist::collect()?; | 16 | let assists = Assist::collect()?; |
17 | let contents = assists.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); | 17 | let contents = assists.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); |
18 | let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim()); | 18 | let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim()); |
diff --git a/xtask/src/codegen/gen_diagnostic_docs.rs b/xtask/src/codegen/gen_diagnostic_docs.rs index 7c14d4a07..a2561817b 100644 --- a/xtask/src/codegen/gen_diagnostic_docs.rs +++ b/xtask/src/codegen/gen_diagnostic_docs.rs | |||
@@ -7,7 +7,7 @@ use crate::{ | |||
7 | project_root, rust_files, Result, | 7 | project_root, rust_files, Result, |
8 | }; | 8 | }; |
9 | 9 | ||
10 | pub fn generate_diagnostic_docs(mode: Mode) -> Result<()> { | 10 | pub(crate) fn generate_diagnostic_docs(mode: Mode) -> Result<()> { |
11 | let diagnostics = Diagnostic::collect()?; | 11 | let diagnostics = Diagnostic::collect()?; |
12 | let contents = | 12 | let contents = |
13 | diagnostics.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); | 13 | diagnostics.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); |
diff --git a/xtask/src/codegen/gen_feature_docs.rs b/xtask/src/codegen/gen_feature_docs.rs index 61081063b..cad7ff477 100644 --- a/xtask/src/codegen/gen_feature_docs.rs +++ b/xtask/src/codegen/gen_feature_docs.rs | |||
@@ -7,7 +7,7 @@ use crate::{ | |||
7 | project_root, rust_files, Result, | 7 | project_root, rust_files, Result, |
8 | }; | 8 | }; |
9 | 9 | ||
10 | pub fn generate_feature_docs(mode: Mode) -> Result<()> { | 10 | pub(crate) fn generate_feature_docs(mode: Mode) -> Result<()> { |
11 | let features = Feature::collect()?; | 11 | let features = Feature::collect()?; |
12 | let contents = features.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); | 12 | let contents = features.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"); |
13 | let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim()); | 13 | let contents = format!("//{}\n{}\n", PREAMBLE, contents.trim()); |
diff --git a/xtask/src/codegen/gen_features.rs b/xtask/src/codegen/gen_features.rs deleted file mode 100644 index 3cf15ce02..000000000 --- a/xtask/src/codegen/gen_features.rs +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | //! Generates descriptors structure for unstable feature from Unstable Book | ||
2 | use std::path::{Path, PathBuf}; | ||
3 | |||
4 | use quote::quote; | ||
5 | use walkdir::WalkDir; | ||
6 | use xshell::{cmd, read_file}; | ||
7 | |||
8 | use crate::codegen::{project_root, reformat, update, Mode, Result}; | ||
9 | |||
10 | pub fn generate_features(mode: Mode) -> Result<()> { | ||
11 | if !Path::new("./target/rust").exists() { | ||
12 | cmd!("git clone https://github.com/rust-lang/rust ./target/rust").run()?; | ||
13 | } | ||
14 | |||
15 | let contents = generate_descriptor("./target/rust/src/doc/unstable-book/src".into())?; | ||
16 | |||
17 | let destination = project_root().join("crates/ide/src/completion/generated_features.rs"); | ||
18 | update(destination.as_path(), &contents, mode)?; | ||
19 | |||
20 | Ok(()) | ||
21 | } | ||
22 | |||
23 | fn generate_descriptor(src_dir: PathBuf) -> Result<String> { | ||
24 | let definitions = ["language-features", "library-features"] | ||
25 | .iter() | ||
26 | .flat_map(|it| WalkDir::new(src_dir.join(it))) | ||
27 | .filter_map(|e| e.ok()) | ||
28 | .filter(|entry| { | ||
29 | // Get all `.md ` files | ||
30 | entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md" | ||
31 | }) | ||
32 | .map(|entry| { | ||
33 | let path = entry.path(); | ||
34 | let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_"); | ||
35 | let doc = read_file(path).unwrap(); | ||
36 | |||
37 | quote! { LintCompletion { label: #feature_ident, description: #doc } } | ||
38 | }); | ||
39 | |||
40 | let ts = quote! { | ||
41 | use crate::completion::complete_attribute::LintCompletion; | ||
42 | |||
43 | pub(super) const FEATURES: &[LintCompletion] = &[ | ||
44 | #(#definitions),* | ||
45 | ]; | ||
46 | }; | ||
47 | reformat(&ts.to_string()) | ||
48 | } | ||
diff --git a/xtask/src/codegen/gen_lint_completions.rs b/xtask/src/codegen/gen_lint_completions.rs index 25f770eaf..b1c057037 100644 --- a/xtask/src/codegen/gen_lint_completions.rs +++ b/xtask/src/codegen/gen_lint_completions.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | //! Generates descriptors structure for unstable feature from Unstable Book | 1 | //! Generates descriptors structure for unstable feature from Unstable Book |
2 | use std::fmt::Write; | ||
2 | use std::path::{Path, PathBuf}; | 3 | use std::path::{Path, PathBuf}; |
3 | 4 | ||
4 | use quote::quote; | ||
5 | use walkdir::WalkDir; | 5 | use walkdir::WalkDir; |
6 | use xshell::{cmd, read_file}; | 6 | use xshell::{cmd, read_file}; |
7 | 7 | ||
@@ -10,21 +10,18 @@ use crate::{ | |||
10 | run_rustfmt, | 10 | run_rustfmt, |
11 | }; | 11 | }; |
12 | 12 | ||
13 | pub fn generate_lint_completions(mode: Mode) -> Result<()> { | 13 | pub(crate) fn generate_lint_completions(mode: Mode) -> Result<()> { |
14 | if !Path::new("./target/rust").exists() { | 14 | if !Path::new("./target/rust").exists() { |
15 | cmd!("git clone --depth=1 https://github.com/rust-lang/rust ./target/rust").run()?; | 15 | cmd!("git clone --depth=1 https://github.com/rust-lang/rust ./target/rust").run()?; |
16 | } | 16 | } |
17 | 17 | ||
18 | let ts_features = generate_descriptor("./target/rust/src/doc/unstable-book/src".into())?; | 18 | let mut contents = String::from("use crate::completions::attribute::LintCompletion;\n\n"); |
19 | cmd!("curl http://rust-lang.github.io/rust-clippy/master/lints.json --output ./target/clippy_lints.json").run()?; | 19 | generate_descriptor(&mut contents, "./target/rust/src/doc/unstable-book/src".into())?; |
20 | contents.push('\n'); | ||
20 | 21 | ||
21 | let ts_clippy = generate_descriptor_clippy(&Path::new("./target/clippy_lints.json"))?; | 22 | cmd!("curl http://rust-lang.github.io/rust-clippy/master/lints.json --output ./target/clippy_lints.json").run()?; |
22 | let ts = quote! { | 23 | generate_descriptor_clippy(&mut contents, &Path::new("./target/clippy_lints.json"))?; |
23 | use crate::completions::attribute::LintCompletion; | 24 | let contents = reformat(&contents)?; |
24 | #ts_features | ||
25 | #ts_clippy | ||
26 | }; | ||
27 | let contents = reformat(ts.to_string().as_str())?; | ||
28 | 25 | ||
29 | let destination = | 26 | let destination = |
30 | project_root().join("crates/ide_completion/src/generated_lint_completions.rs"); | 27 | project_root().join("crates/ide_completion/src/generated_lint_completions.rs"); |
@@ -34,8 +31,10 @@ pub fn generate_lint_completions(mode: Mode) -> Result<()> { | |||
34 | Ok(()) | 31 | Ok(()) |
35 | } | 32 | } |
36 | 33 | ||
37 | fn generate_descriptor(src_dir: PathBuf) -> Result<proc_macro2::TokenStream> { | 34 | fn generate_descriptor(buf: &mut String, src_dir: PathBuf) -> Result<()> { |
38 | let definitions = ["language-features", "library-features"] | 35 | buf.push_str(r#"pub(super) const FEATURES: &[LintCompletion] = &["#); |
36 | buf.push('\n'); | ||
37 | ["language-features", "library-features"] | ||
39 | .iter() | 38 | .iter() |
40 | .flat_map(|it| WalkDir::new(src_dir.join(it))) | 39 | .flat_map(|it| WalkDir::new(src_dir.join(it))) |
41 | .filter_map(|e| e.ok()) | 40 | .filter_map(|e| e.ok()) |
@@ -43,21 +42,15 @@ fn generate_descriptor(src_dir: PathBuf) -> Result<proc_macro2::TokenStream> { | |||
43 | // Get all `.md ` files | 42 | // Get all `.md ` files |
44 | entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md" | 43 | entry.file_type().is_file() && entry.path().extension().unwrap_or_default() == "md" |
45 | }) | 44 | }) |
46 | .map(|entry| { | 45 | .for_each(|entry| { |
47 | let path = entry.path(); | 46 | let path = entry.path(); |
48 | let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_"); | 47 | let feature_ident = path.file_stem().unwrap().to_str().unwrap().replace("-", "_"); |
49 | let doc = read_file(path).unwrap(); | 48 | let doc = read_file(path).unwrap(); |
50 | 49 | ||
51 | quote! { LintCompletion { label: #feature_ident, description: #doc } } | 50 | push_lint_completion(buf, &feature_ident, &doc); |
52 | }); | 51 | }); |
53 | 52 | buf.push_str("];\n"); | |
54 | let ts = quote! { | 53 | Ok(()) |
55 | pub(super) const FEATURES: &[LintCompletion] = &[ | ||
56 | #(#definitions),* | ||
57 | ]; | ||
58 | }; | ||
59 | |||
60 | Ok(ts) | ||
61 | } | 54 | } |
62 | 55 | ||
63 | #[derive(Default)] | 56 | #[derive(Default)] |
@@ -66,7 +59,7 @@ struct ClippyLint { | |||
66 | id: String, | 59 | id: String, |
67 | } | 60 | } |
68 | 61 | ||
69 | fn generate_descriptor_clippy(path: &Path) -> Result<proc_macro2::TokenStream> { | 62 | fn generate_descriptor_clippy(buf: &mut String, path: &Path) -> Result<()> { |
70 | let file_content = read_file(path)?; | 63 | let file_content = read_file(path)?; |
71 | let mut clippy_lints: Vec<ClippyLint> = vec![]; | 64 | let mut clippy_lints: Vec<ClippyLint> = vec![]; |
72 | 65 | ||
@@ -97,18 +90,27 @@ fn generate_descriptor_clippy(path: &Path) -> Result<proc_macro2::TokenStream> { | |||
97 | } | 90 | } |
98 | } | 91 | } |
99 | 92 | ||
100 | let definitions = clippy_lints.into_iter().map(|clippy_lint| { | 93 | buf.push_str(r#"pub(super) const CLIPPY_LINTS: &[LintCompletion] = &["#); |
94 | buf.push('\n'); | ||
95 | clippy_lints.into_iter().for_each(|clippy_lint| { | ||
101 | let lint_ident = format!("clippy::{}", clippy_lint.id); | 96 | let lint_ident = format!("clippy::{}", clippy_lint.id); |
102 | let doc = clippy_lint.help; | 97 | let doc = clippy_lint.help; |
103 | 98 | push_lint_completion(buf, &lint_ident, &doc); | |
104 | quote! { LintCompletion { label: #lint_ident, description: #doc } } | ||
105 | }); | 99 | }); |
106 | 100 | ||
107 | let ts = quote! { | 101 | buf.push_str("];\n"); |
108 | pub(super) const CLIPPY_LINTS: &[LintCompletion] = &[ | 102 | |
109 | #(#definitions),* | 103 | Ok(()) |
110 | ]; | 104 | } |
111 | }; | ||
112 | 105 | ||
113 | Ok(ts) | 106 | fn push_lint_completion(buf: &mut String, label: &str, description: &str) { |
107 | writeln!( | ||
108 | buf, | ||
109 | r###" LintCompletion {{ | ||
110 | label: "{}", | ||
111 | description: r##"{}"## | ||
112 | }},"###, | ||
113 | label, description | ||
114 | ) | ||
115 | .unwrap(); | ||
114 | } | 116 | } |
diff --git a/xtask/src/codegen/gen_parser_tests.rs b/xtask/src/codegen/gen_parser_tests.rs index 6e4abd10c..cb8939063 100644 --- a/xtask/src/codegen/gen_parser_tests.rs +++ b/xtask/src/codegen/gen_parser_tests.rs | |||
@@ -12,7 +12,7 @@ use crate::{ | |||
12 | project_root, Result, | 12 | project_root, Result, |
13 | }; | 13 | }; |
14 | 14 | ||
15 | pub fn generate_parser_tests(mode: Mode) -> Result<()> { | 15 | pub(crate) fn generate_parser_tests(mode: Mode) -> Result<()> { |
16 | let tests = tests_from_dir(&project_root().join(Path::new("crates/parser/src/grammar")))?; | 16 | let tests = tests_from_dir(&project_root().join(Path::new("crates/parser/src/grammar")))?; |
17 | fn install_tests(tests: &HashMap<String, Test>, into: &str, mode: Mode) -> Result<()> { | 17 | fn install_tests(tests: &HashMap<String, Test>, into: &str, mode: Mode) -> Result<()> { |
18 | let tests_dir = project_root().join(into); | 18 | let tests_dir = project_root().join(into); |
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index eb524d85a..191bc0e9d 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs | |||
@@ -18,7 +18,7 @@ use crate::{ | |||
18 | project_root, Result, | 18 | project_root, Result, |
19 | }; | 19 | }; |
20 | 20 | ||
21 | pub fn generate_syntax(mode: Mode) -> Result<()> { | 21 | pub(crate) fn generate_syntax(mode: Mode) -> Result<()> { |
22 | let grammar = rust_grammar(); | 22 | let grammar = rust_grammar(); |
23 | let ast = lower(&grammar); | 23 | let ast = lower(&grammar); |
24 | 24 | ||
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index 56bf9f99d..f2503f807 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs | |||
@@ -11,13 +11,13 @@ use xshell::{cmd, cp, mkdir_p, pushd, read_file, rm_rf, write_file}; | |||
11 | 11 | ||
12 | use crate::{date_iso, project_root}; | 12 | use crate::{date_iso, project_root}; |
13 | 13 | ||
14 | pub struct DistCmd { | 14 | pub(crate) struct DistCmd { |
15 | pub nightly: bool, | 15 | pub(crate) nightly: bool, |
16 | pub client_version: Option<String>, | 16 | pub(crate) client_version: Option<String>, |
17 | } | 17 | } |
18 | 18 | ||
19 | impl DistCmd { | 19 | impl DistCmd { |
20 | pub fn run(self) -> Result<()> { | 20 | pub(crate) fn run(self) -> Result<()> { |
21 | let dist = project_root().join("dist"); | 21 | let dist = project_root().join("dist"); |
22 | rm_rf(&dist)?; | 22 | rm_rf(&dist)?; |
23 | mkdir_p(&dist)?; | 23 | mkdir_p(&dist)?; |
diff --git a/xtask/src/flags.rs b/xtask/src/flags.rs new file mode 100644 index 000000000..5710fbdb5 --- /dev/null +++ b/xtask/src/flags.rs | |||
@@ -0,0 +1,139 @@ | |||
1 | #![allow(unreachable_pub)] | ||
2 | |||
3 | xflags::args_parser! { | ||
4 | /// Run custom build command. | ||
5 | cmd xtask { | ||
6 | default cmd help { | ||
7 | /// Print help information. | ||
8 | optional -h, --help | ||
9 | } | ||
10 | |||
11 | /// Install rust-analyzer server or editor plugin. | ||
12 | cmd install { | ||
13 | /// Install only VS Code plugin. | ||
14 | optional --client | ||
15 | /// One of 'code', 'code-exploration', 'code-insiders', 'codium', or 'code-oss'. | ||
16 | optional --code-bin name: String | ||
17 | |||
18 | /// Install only the language server. | ||
19 | optional --server | ||
20 | /// Use mimalloc allocator for server | ||
21 | optional --mimalloc | ||
22 | /// Use jemalloc allocator for server | ||
23 | optional --jemalloc | ||
24 | } | ||
25 | |||
26 | cmd codegen { | ||
27 | optional --features | ||
28 | } | ||
29 | |||
30 | cmd lint {} | ||
31 | cmd fuzz-tests {} | ||
32 | cmd pre-cache {} | ||
33 | |||
34 | cmd release { | ||
35 | optional --dry-run | ||
36 | } | ||
37 | cmd promote { | ||
38 | optional --dry-run | ||
39 | } | ||
40 | cmd dist { | ||
41 | optional --nightly | ||
42 | optional --client version: String | ||
43 | } | ||
44 | cmd metrics { | ||
45 | optional --dry-run | ||
46 | } | ||
47 | /// Builds a benchmark version of rust-analyzer and puts it into `./target`. | ||
48 | cmd bb | ||
49 | required suffix: String | ||
50 | {} | ||
51 | } | ||
52 | } | ||
53 | |||
54 | // generated start | ||
55 | // The following code is generated by `xflags` macro. | ||
56 | // Run `env XFLAGS_DUMP= cargo build` to regenerate. | ||
57 | #[derive(Debug)] | ||
58 | pub struct Xtask { | ||
59 | pub subcommand: XtaskCmd, | ||
60 | } | ||
61 | |||
62 | #[derive(Debug)] | ||
63 | pub enum XtaskCmd { | ||
64 | Help(Help), | ||
65 | Install(Install), | ||
66 | Codegen(Codegen), | ||
67 | Lint(Lint), | ||
68 | FuzzTests(FuzzTests), | ||
69 | PreCache(PreCache), | ||
70 | Release(Release), | ||
71 | Promote(Promote), | ||
72 | Dist(Dist), | ||
73 | Metrics(Metrics), | ||
74 | Bb(Bb), | ||
75 | } | ||
76 | |||
77 | #[derive(Debug)] | ||
78 | pub struct Help { | ||
79 | pub help: bool, | ||
80 | } | ||
81 | |||
82 | #[derive(Debug)] | ||
83 | pub struct Install { | ||
84 | pub client: bool, | ||
85 | pub code_bin: Option<String>, | ||
86 | pub server: bool, | ||
87 | pub mimalloc: bool, | ||
88 | pub jemalloc: bool, | ||
89 | } | ||
90 | |||
91 | #[derive(Debug)] | ||
92 | pub struct Codegen { | ||
93 | pub features: bool, | ||
94 | } | ||
95 | |||
96 | #[derive(Debug)] | ||
97 | pub struct Lint {} | ||
98 | |||
99 | #[derive(Debug)] | ||
100 | pub struct FuzzTests {} | ||
101 | |||
102 | #[derive(Debug)] | ||
103 | pub struct PreCache {} | ||
104 | |||
105 | #[derive(Debug)] | ||
106 | pub struct Release { | ||
107 | pub dry_run: bool, | ||
108 | } | ||
109 | |||
110 | #[derive(Debug)] | ||
111 | pub struct Promote { | ||
112 | pub dry_run: bool, | ||
113 | } | ||
114 | |||
115 | #[derive(Debug)] | ||
116 | pub struct Dist { | ||
117 | pub nightly: bool, | ||
118 | pub client: Option<String>, | ||
119 | } | ||
120 | |||
121 | #[derive(Debug)] | ||
122 | pub struct Metrics { | ||
123 | pub dry_run: bool, | ||
124 | } | ||
125 | |||
126 | #[derive(Debug)] | ||
127 | pub struct Bb { | ||
128 | pub suffix: String, | ||
129 | } | ||
130 | |||
131 | impl Xtask { | ||
132 | pub const HELP: &'static str = Self::_HELP; | ||
133 | |||
134 | pub fn from_env() -> xflags::Result<Self> { | ||
135 | let mut p = xflags::rt::Parser::new_from_env(); | ||
136 | Self::_parse(&mut p) | ||
137 | } | ||
138 | } | ||
139 | // generated end | ||
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index 4c5c2673c..ea2194248 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -8,13 +8,13 @@ use xshell::{cmd, pushd}; | |||
8 | // Latest stable, feel free to send a PR if this lags behind. | 8 | // Latest stable, feel free to send a PR if this lags behind. |
9 | const REQUIRED_RUST_VERSION: u32 = 50; | 9 | const REQUIRED_RUST_VERSION: u32 = 50; |
10 | 10 | ||
11 | pub struct InstallCmd { | 11 | pub(crate) struct InstallCmd { |
12 | pub client: Option<ClientOpt>, | 12 | pub(crate) client: Option<ClientOpt>, |
13 | pub server: Option<ServerOpt>, | 13 | pub(crate) server: Option<ServerOpt>, |
14 | } | 14 | } |
15 | 15 | ||
16 | #[derive(Clone, Copy)] | 16 | #[derive(Clone, Copy)] |
17 | pub enum ClientOpt { | 17 | pub(crate) enum ClientOpt { |
18 | VsCode, | 18 | VsCode, |
19 | VsCodeExploration, | 19 | VsCodeExploration, |
20 | VsCodeInsiders, | 20 | VsCodeInsiders, |
@@ -24,7 +24,7 @@ pub enum ClientOpt { | |||
24 | } | 24 | } |
25 | 25 | ||
26 | impl ClientOpt { | 26 | impl ClientOpt { |
27 | pub const fn as_cmds(&self) -> &'static [&'static str] { | 27 | pub(crate) const fn as_cmds(&self) -> &'static [&'static str] { |
28 | match self { | 28 | match self { |
29 | ClientOpt::VsCode => &["code"], | 29 | ClientOpt::VsCode => &["code"], |
30 | ClientOpt::VsCodeExploration => &["code-exploration"], | 30 | ClientOpt::VsCodeExploration => &["code-exploration"], |
@@ -60,18 +60,18 @@ impl std::str::FromStr for ClientOpt { | |||
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | pub struct ServerOpt { | 63 | pub(crate) struct ServerOpt { |
64 | pub malloc: Malloc, | 64 | pub(crate) malloc: Malloc, |
65 | } | 65 | } |
66 | 66 | ||
67 | pub enum Malloc { | 67 | pub(crate) enum Malloc { |
68 | System, | 68 | System, |
69 | Mimalloc, | 69 | Mimalloc, |
70 | Jemalloc, | 70 | Jemalloc, |
71 | } | 71 | } |
72 | 72 | ||
73 | impl InstallCmd { | 73 | impl InstallCmd { |
74 | pub fn run(self) -> Result<()> { | 74 | pub(crate) fn run(self) -> Result<()> { |
75 | if cfg!(target_os = "macos") { | 75 | if cfg!(target_os = "macos") { |
76 | fix_path_for_mac().context("Fix path for mac")? | 76 | fix_path_for_mac().context("Fix path for mac")? |
77 | } | 77 | } |
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs deleted file mode 100644 index b19985fb2..000000000 --- a/xtask/src/lib.rs +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | //! Support library for `cargo xtask` command. | ||
2 | //! | ||
3 | //! See https://github.com/matklad/cargo-xtask/ | ||
4 | |||
5 | pub mod codegen; | ||
6 | mod ast_src; | ||
7 | |||
8 | pub mod install; | ||
9 | pub mod release; | ||
10 | pub mod dist; | ||
11 | pub mod pre_commit; | ||
12 | pub mod metrics; | ||
13 | pub mod pre_cache; | ||
14 | |||
15 | use std::{ | ||
16 | env, | ||
17 | path::{Path, PathBuf}, | ||
18 | }; | ||
19 | |||
20 | use walkdir::{DirEntry, WalkDir}; | ||
21 | use xshell::{cmd, pushd, pushenv}; | ||
22 | |||
23 | use crate::codegen::Mode; | ||
24 | |||
25 | pub use anyhow::{bail, Context as _, Result}; | ||
26 | |||
27 | pub fn project_root() -> PathBuf { | ||
28 | Path::new( | ||
29 | &env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned()), | ||
30 | ) | ||
31 | .ancestors() | ||
32 | .nth(1) | ||
33 | .unwrap() | ||
34 | .to_path_buf() | ||
35 | } | ||
36 | |||
37 | pub fn rust_files() -> impl Iterator<Item = PathBuf> { | ||
38 | rust_files_in(&project_root().join("crates")) | ||
39 | } | ||
40 | |||
41 | pub fn cargo_files() -> impl Iterator<Item = PathBuf> { | ||
42 | files_in(&project_root(), "toml") | ||
43 | .filter(|path| path.file_name().map(|it| it == "Cargo.toml").unwrap_or(false)) | ||
44 | } | ||
45 | |||
46 | pub fn rust_files_in(path: &Path) -> impl Iterator<Item = PathBuf> { | ||
47 | files_in(path, "rs") | ||
48 | } | ||
49 | |||
50 | pub fn run_rustfmt(mode: Mode) -> Result<()> { | ||
51 | let _dir = pushd(project_root())?; | ||
52 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); | ||
53 | ensure_rustfmt()?; | ||
54 | let check = match mode { | ||
55 | Mode::Overwrite => &[][..], | ||
56 | Mode::Verify => &["--", "--check"], | ||
57 | }; | ||
58 | cmd!("cargo fmt {check...}").run()?; | ||
59 | Ok(()) | ||
60 | } | ||
61 | |||
62 | fn ensure_rustfmt() -> Result<()> { | ||
63 | let out = cmd!("rustfmt --version").read()?; | ||
64 | if !out.contains("stable") { | ||
65 | bail!( | ||
66 | "Failed to run rustfmt from toolchain 'stable'. \ | ||
67 | Please run `rustup component add rustfmt --toolchain stable` to install it.", | ||
68 | ) | ||
69 | } | ||
70 | Ok(()) | ||
71 | } | ||
72 | |||
73 | pub fn run_clippy() -> Result<()> { | ||
74 | if cmd!("cargo clippy --version").read().is_err() { | ||
75 | bail!( | ||
76 | "Failed run cargo clippy. \ | ||
77 | Please run `rustup component add clippy` to install it.", | ||
78 | ) | ||
79 | } | ||
80 | |||
81 | let allowed_lints = " | ||
82 | -A clippy::collapsible_if | ||
83 | -A clippy::needless_pass_by_value | ||
84 | -A clippy::nonminimal_bool | ||
85 | -A clippy::redundant_pattern_matching | ||
86 | " | ||
87 | .split_ascii_whitespace(); | ||
88 | cmd!("cargo clippy --all-features --all-targets -- {allowed_lints...}").run()?; | ||
89 | Ok(()) | ||
90 | } | ||
91 | |||
92 | pub fn run_fuzzer() -> Result<()> { | ||
93 | let _d = pushd("./crates/syntax")?; | ||
94 | let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); | ||
95 | if cmd!("cargo fuzz --help").read().is_err() { | ||
96 | cmd!("cargo install cargo-fuzz").run()?; | ||
97 | }; | ||
98 | |||
99 | // Expecting nightly rustc | ||
100 | let out = cmd!("rustc --version").read()?; | ||
101 | if !out.contains("nightly") { | ||
102 | bail!("fuzz tests require nightly rustc") | ||
103 | } | ||
104 | |||
105 | cmd!("cargo fuzz run parser").run()?; | ||
106 | Ok(()) | ||
107 | } | ||
108 | |||
109 | fn date_iso() -> Result<String> { | ||
110 | let res = cmd!("date --iso --utc").read()?; | ||
111 | Ok(res) | ||
112 | } | ||
113 | |||
114 | fn is_release_tag(tag: &str) -> bool { | ||
115 | tag.len() == "2020-02-24".len() && tag.starts_with(|c: char| c.is_ascii_digit()) | ||
116 | } | ||
117 | |||
118 | fn files_in(path: &Path, ext: &'static str) -> impl Iterator<Item = PathBuf> { | ||
119 | let iter = WalkDir::new(path); | ||
120 | return iter | ||
121 | .into_iter() | ||
122 | .filter_entry(|e| !is_hidden(e)) | ||
123 | .map(|e| e.unwrap()) | ||
124 | .filter(|e| !e.file_type().is_dir()) | ||
125 | .map(|e| e.into_path()) | ||
126 | .filter(move |path| path.extension().map(|it| it == ext).unwrap_or(false)); | ||
127 | |||
128 | fn is_hidden(entry: &DirEntry) -> bool { | ||
129 | entry.file_name().to_str().map(|s| s.starts_with('.')).unwrap_or(false) | ||
130 | } | ||
131 | } | ||
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index cbb9b315e..e419db7a7 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -7,59 +7,44 @@ | |||
7 | //! | 7 | //! |
8 | //! This binary is integrated into the `cargo` command line by using an alias in | 8 | //! This binary is integrated into the `cargo` command line by using an alias in |
9 | //! `.cargo/config`. | 9 | //! `.cargo/config`. |
10 | mod flags; | ||
10 | 11 | ||
11 | use std::env; | 12 | mod codegen; |
13 | mod ast_src; | ||
14 | #[cfg(test)] | ||
15 | mod tidy; | ||
12 | 16 | ||
13 | use anyhow::bail; | 17 | mod install; |
14 | use codegen::CodegenCmd; | 18 | mod release; |
15 | use pico_args::Arguments; | 19 | mod dist; |
16 | use xshell::{cmd, cp, pushd}; | 20 | mod metrics; |
17 | use xtask::{ | 21 | mod pre_cache; |
18 | codegen::{self, Mode}, | 22 | |
23 | use anyhow::{bail, Result}; | ||
24 | use std::{ | ||
25 | env, | ||
26 | path::{Path, PathBuf}, | ||
27 | }; | ||
28 | use walkdir::{DirEntry, WalkDir}; | ||
29 | use xshell::{cmd, cp, pushd, pushenv}; | ||
30 | |||
31 | use crate::{ | ||
32 | codegen::Mode, | ||
19 | dist::DistCmd, | 33 | dist::DistCmd, |
20 | install::{InstallCmd, Malloc, ServerOpt}, | 34 | install::{InstallCmd, Malloc, ServerOpt}, |
21 | metrics::MetricsCmd, | ||
22 | pre_cache::PreCacheCmd, | ||
23 | pre_commit, project_root, | ||
24 | release::{PromoteCmd, ReleaseCmd}, | ||
25 | run_clippy, run_fuzzer, run_rustfmt, Result, | ||
26 | }; | 35 | }; |
27 | 36 | ||
28 | fn main() -> Result<()> { | 37 | fn main() -> Result<()> { |
29 | if env::args().next().map(|it| it.contains("pre-commit")) == Some(true) { | ||
30 | return pre_commit::run_hook(); | ||
31 | } | ||
32 | |||
33 | let _d = pushd(project_root())?; | 38 | let _d = pushd(project_root())?; |
34 | 39 | ||
35 | let mut args = Arguments::from_env(); | 40 | let flags = flags::Xtask::from_env()?; |
36 | let subcommand = args.subcommand()?.unwrap_or_default(); | 41 | match flags.subcommand { |
37 | 42 | flags::XtaskCmd::Help(_) => { | |
38 | match subcommand.as_str() { | 43 | println!("{}", flags::Xtask::HELP); |
39 | "install" => { | 44 | return Ok(()); |
40 | if args.contains(["-h", "--help"]) { | 45 | } |
41 | eprintln!( | 46 | flags::XtaskCmd::Install(flags) => { |
42 | "\ | 47 | if flags.server && flags.client { |
43 | cargo xtask install | ||
44 | Install rust-analyzer server or editor plugin. | ||
45 | |||
46 | USAGE: | ||
47 | cargo xtask install [FLAGS] | ||
48 | |||
49 | FLAGS: | ||
50 | --client[=CLIENT] Install only VS Code plugin. | ||
51 | CLIENT is one of 'code', 'code-exploration', 'code-insiders', 'codium', or 'code-oss' | ||
52 | --server Install only the language server | ||
53 | --mimalloc Use mimalloc allocator for server | ||
54 | --jemalloc Use jemalloc allocator for server | ||
55 | -h, --help Prints help information | ||
56 | " | ||
57 | ); | ||
58 | return Ok(()); | ||
59 | } | ||
60 | let server = args.contains("--server"); | ||
61 | let client_code = args.contains("--client"); | ||
62 | if server && client_code { | ||
63 | eprintln!( | 48 | eprintln!( |
64 | "error: The argument `--server` cannot be used with `--client`\n\n\ | 49 | "error: The argument `--server` cannot be used with `--client`\n\n\ |
65 | For more information try --help" | 50 | For more information try --help" |
@@ -67,108 +52,146 @@ FLAGS: | |||
67 | return Ok(()); | 52 | return Ok(()); |
68 | } | 53 | } |
69 | 54 | ||
70 | let malloc = if args.contains("--mimalloc") { | 55 | let malloc = if flags.mimalloc { |
71 | Malloc::Mimalloc | 56 | Malloc::Mimalloc |
72 | } else if args.contains("--jemalloc") { | 57 | } else if flags.jemalloc { |
73 | Malloc::Jemalloc | 58 | Malloc::Jemalloc |
74 | } else { | 59 | } else { |
75 | Malloc::System | 60 | Malloc::System |
76 | }; | 61 | }; |
77 | 62 | ||
78 | let client_opt = args.opt_value_from_str("--client")?; | 63 | let client_bin = flags.code_bin.map(|it| it.parse()).transpose()?; |
79 | |||
80 | finish_args(args)?; | ||
81 | 64 | ||
82 | InstallCmd { | 65 | InstallCmd { |
83 | client: if server { None } else { Some(client_opt.unwrap_or_default()) }, | 66 | client: if flags.server { None } else { client_bin }, |
84 | server: if client_code { None } else { Some(ServerOpt { malloc }) }, | 67 | server: if flags.client { None } else { Some(ServerOpt { malloc }) }, |
85 | } | 68 | } |
86 | .run() | 69 | .run() |
87 | } | 70 | } |
88 | "codegen" => { | 71 | flags::XtaskCmd::Codegen(cmd) => cmd.run(), |
89 | let features = args.contains("--features"); | 72 | flags::XtaskCmd::Lint(_) => run_clippy(), |
90 | finish_args(args)?; | 73 | flags::XtaskCmd::FuzzTests(_) => run_fuzzer(), |
91 | CodegenCmd { features }.run() | 74 | flags::XtaskCmd::PreCache(cmd) => cmd.run(), |
92 | } | 75 | flags::XtaskCmd::Release(cmd) => cmd.run(), |
93 | "format" => { | 76 | flags::XtaskCmd::Promote(cmd) => cmd.run(), |
94 | finish_args(args)?; | 77 | flags::XtaskCmd::Dist(flags) => { |
95 | run_rustfmt(Mode::Overwrite) | 78 | DistCmd { nightly: flags.nightly, client_version: flags.client }.run() |
96 | } | ||
97 | "install-pre-commit-hook" => { | ||
98 | finish_args(args)?; | ||
99 | pre_commit::install_hook() | ||
100 | } | 79 | } |
101 | "lint" => { | 80 | flags::XtaskCmd::Metrics(cmd) => cmd.run(), |
102 | finish_args(args)?; | 81 | flags::XtaskCmd::Bb(cmd) => { |
103 | run_clippy() | ||
104 | } | ||
105 | "fuzz-tests" => { | ||
106 | finish_args(args)?; | ||
107 | run_fuzzer() | ||
108 | } | ||
109 | "pre-cache" => { | ||
110 | finish_args(args)?; | ||
111 | PreCacheCmd.run() | ||
112 | } | ||
113 | "release" => { | ||
114 | let dry_run = args.contains("--dry-run"); | ||
115 | finish_args(args)?; | ||
116 | ReleaseCmd { dry_run }.run() | ||
117 | } | ||
118 | "promote" => { | ||
119 | let dry_run = args.contains("--dry-run"); | ||
120 | finish_args(args)?; | ||
121 | PromoteCmd { dry_run }.run() | ||
122 | } | ||
123 | "dist" => { | ||
124 | let nightly = args.contains("--nightly"); | ||
125 | let client_version: Option<String> = args.opt_value_from_str("--client")?; | ||
126 | finish_args(args)?; | ||
127 | DistCmd { nightly, client_version }.run() | ||
128 | } | ||
129 | "metrics" => { | ||
130 | let dry_run = args.contains("--dry-run"); | ||
131 | finish_args(args)?; | ||
132 | MetricsCmd { dry_run }.run() | ||
133 | } | ||
134 | "bb" => { | ||
135 | let suffix: String = args.free_from_str()?; | ||
136 | finish_args(args)?; | ||
137 | { | 82 | { |
138 | let _d = pushd("./crates/rust-analyzer")?; | 83 | let _d = pushd("./crates/rust-analyzer")?; |
139 | cmd!("cargo build --release --features jemalloc").run()?; | 84 | cmd!("cargo build --release --features jemalloc").run()?; |
140 | } | 85 | } |
141 | cp("./target/release/rust-analyzer", format!("./target/rust-analyzer-{}", suffix))?; | 86 | cp("./target/release/rust-analyzer", format!("./target/rust-analyzer-{}", cmd.suffix))?; |
142 | Ok(()) | ||
143 | } | ||
144 | _ => { | ||
145 | eprintln!( | ||
146 | "\ | ||
147 | cargo xtask | ||
148 | Run custom build command. | ||
149 | |||
150 | USAGE: | ||
151 | cargo xtask <SUBCOMMAND> | ||
152 | |||
153 | SUBCOMMANDS: | ||
154 | format | ||
155 | install-pre-commit-hook | ||
156 | fuzz-tests | ||
157 | codegen | ||
158 | install | ||
159 | lint | ||
160 | dist | ||
161 | promote | ||
162 | bb" | ||
163 | ); | ||
164 | Ok(()) | 87 | Ok(()) |
165 | } | 88 | } |
166 | } | 89 | } |
167 | } | 90 | } |
168 | 91 | ||
169 | fn finish_args(args: Arguments) -> Result<()> { | 92 | fn project_root() -> PathBuf { |
170 | if !args.finish().is_empty() { | 93 | Path::new( |
171 | bail!("Unused arguments."); | 94 | &env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned()), |
95 | ) | ||
96 | .ancestors() | ||
97 | .nth(1) | ||
98 | .unwrap() | ||
99 | .to_path_buf() | ||
100 | } | ||
101 | |||
102 | fn rust_files() -> impl Iterator<Item = PathBuf> { | ||
103 | rust_files_in(&project_root().join("crates")) | ||
104 | } | ||
105 | |||
106 | #[cfg(test)] | ||
107 | fn cargo_files() -> impl Iterator<Item = PathBuf> { | ||
108 | files_in(&project_root(), "toml") | ||
109 | .filter(|path| path.file_name().map(|it| it == "Cargo.toml").unwrap_or(false)) | ||
110 | } | ||
111 | |||
112 | fn rust_files_in(path: &Path) -> impl Iterator<Item = PathBuf> { | ||
113 | files_in(path, "rs") | ||
114 | } | ||
115 | |||
116 | fn run_rustfmt(mode: Mode) -> Result<()> { | ||
117 | let _dir = pushd(project_root())?; | ||
118 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); | ||
119 | ensure_rustfmt()?; | ||
120 | let check = match mode { | ||
121 | Mode::Overwrite => &[][..], | ||
122 | Mode::Verify => &["--", "--check"], | ||
123 | }; | ||
124 | cmd!("cargo fmt {check...}").run()?; | ||
125 | Ok(()) | ||
126 | } | ||
127 | |||
128 | fn ensure_rustfmt() -> Result<()> { | ||
129 | let out = cmd!("rustfmt --version").read()?; | ||
130 | if !out.contains("stable") { | ||
131 | bail!( | ||
132 | "Failed to run rustfmt from toolchain 'stable'. \ | ||
133 | Please run `rustup component add rustfmt --toolchain stable` to install it.", | ||
134 | ) | ||
135 | } | ||
136 | Ok(()) | ||
137 | } | ||
138 | |||
139 | fn run_clippy() -> Result<()> { | ||
140 | if cmd!("cargo clippy --version").read().is_err() { | ||
141 | bail!( | ||
142 | "Failed run cargo clippy. \ | ||
143 | Please run `rustup component add clippy` to install it.", | ||
144 | ) | ||
145 | } | ||
146 | |||
147 | let allowed_lints = " | ||
148 | -A clippy::collapsible_if | ||
149 | -A clippy::needless_pass_by_value | ||
150 | -A clippy::nonminimal_bool | ||
151 | -A clippy::redundant_pattern_matching | ||
152 | " | ||
153 | .split_ascii_whitespace(); | ||
154 | cmd!("cargo clippy --all-features --all-targets -- {allowed_lints...}").run()?; | ||
155 | Ok(()) | ||
156 | } | ||
157 | |||
158 | fn run_fuzzer() -> Result<()> { | ||
159 | let _d = pushd("./crates/syntax")?; | ||
160 | let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); | ||
161 | if cmd!("cargo fuzz --help").read().is_err() { | ||
162 | cmd!("cargo install cargo-fuzz").run()?; | ||
163 | }; | ||
164 | |||
165 | // Expecting nightly rustc | ||
166 | let out = cmd!("rustc --version").read()?; | ||
167 | if !out.contains("nightly") { | ||
168 | bail!("fuzz tests require nightly rustc") | ||
172 | } | 169 | } |
170 | |||
171 | cmd!("cargo fuzz run parser").run()?; | ||
173 | Ok(()) | 172 | Ok(()) |
174 | } | 173 | } |
174 | |||
175 | fn date_iso() -> Result<String> { | ||
176 | let res = cmd!("date --iso --utc").read()?; | ||
177 | Ok(res) | ||
178 | } | ||
179 | |||
180 | fn is_release_tag(tag: &str) -> bool { | ||
181 | tag.len() == "2020-02-24".len() && tag.starts_with(|c: char| c.is_ascii_digit()) | ||
182 | } | ||
183 | |||
184 | fn files_in(path: &Path, ext: &'static str) -> impl Iterator<Item = PathBuf> { | ||
185 | let iter = WalkDir::new(path); | ||
186 | return iter | ||
187 | .into_iter() | ||
188 | .filter_entry(|e| !is_hidden(e)) | ||
189 | .map(|e| e.unwrap()) | ||
190 | .filter(|e| !e.file_type().is_dir()) | ||
191 | .map(|e| e.into_path()) | ||
192 | .filter(move |path| path.extension().map(|it| it == ext).unwrap_or(false)); | ||
193 | |||
194 | fn is_hidden(entry: &DirEntry) -> bool { | ||
195 | entry.file_name().to_str().map(|s| s.starts_with('.')).unwrap_or(false) | ||
196 | } | ||
197 | } | ||
diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs index 624ad3b7e..eb58b3274 100644 --- a/xtask/src/metrics.rs +++ b/xtask/src/metrics.rs | |||
@@ -9,14 +9,12 @@ use std::{ | |||
9 | use anyhow::{bail, format_err, Result}; | 9 | use anyhow::{bail, format_err, Result}; |
10 | use xshell::{cmd, mkdir_p, pushd, pushenv, read_file, rm_rf}; | 10 | use xshell::{cmd, mkdir_p, pushd, pushenv, read_file, rm_rf}; |
11 | 11 | ||
12 | type Unit = String; | 12 | use crate::flags; |
13 | 13 | ||
14 | pub struct MetricsCmd { | 14 | type Unit = String; |
15 | pub dry_run: bool, | ||
16 | } | ||
17 | 15 | ||
18 | impl MetricsCmd { | 16 | impl flags::Metrics { |
19 | pub fn run(self) -> Result<()> { | 17 | pub(crate) fn run(self) -> Result<()> { |
20 | let mut metrics = Metrics::new()?; | 18 | let mut metrics = Metrics::new()?; |
21 | if !self.dry_run { | 19 | if !self.dry_run { |
22 | rm_rf("./target/release")?; | 20 | rm_rf("./target/release")?; |
diff --git a/xtask/src/pre_cache.rs b/xtask/src/pre_cache.rs index 569f88f68..b456224fd 100644 --- a/xtask/src/pre_cache.rs +++ b/xtask/src/pre_cache.rs | |||
@@ -6,12 +6,12 @@ use std::{ | |||
6 | use anyhow::Result; | 6 | use anyhow::Result; |
7 | use xshell::rm_rf; | 7 | use xshell::rm_rf; |
8 | 8 | ||
9 | pub struct PreCacheCmd; | 9 | use crate::flags; |
10 | 10 | ||
11 | impl PreCacheCmd { | 11 | impl flags::PreCache { |
12 | /// Cleans the `./target` dir after the build such that only | 12 | /// Cleans the `./target` dir after the build such that only |
13 | /// dependencies are cached on CI. | 13 | /// dependencies are cached on CI. |
14 | pub fn run(self) -> Result<()> { | 14 | pub(crate) fn run(self) -> Result<()> { |
15 | let slow_tests_cookie = Path::new("./target/.slow_tests_cookie"); | 15 | let slow_tests_cookie = Path::new("./target/.slow_tests_cookie"); |
16 | if !slow_tests_cookie.exists() { | 16 | if !slow_tests_cookie.exists() { |
17 | panic!("slow tests were skipped on CI!") | 17 | panic!("slow tests were skipped on CI!") |
diff --git a/xtask/src/pre_commit.rs b/xtask/src/pre_commit.rs deleted file mode 100644 index 8f2dbea19..000000000 --- a/xtask/src/pre_commit.rs +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | //! pre-commit hook for code formatting. | ||
2 | |||
3 | use std::{fs, path::PathBuf}; | ||
4 | |||
5 | use anyhow::{bail, Result}; | ||
6 | use xshell::cmd; | ||
7 | |||
8 | use crate::{project_root, run_rustfmt, Mode}; | ||
9 | |||
10 | // FIXME: if there are changed `.ts` files, also reformat TypeScript (by | ||
11 | // shelling out to `npm fmt`). | ||
12 | pub fn run_hook() -> Result<()> { | ||
13 | run_rustfmt(Mode::Overwrite)?; | ||
14 | |||
15 | let diff = cmd!("git diff --diff-filter=MAR --name-only --cached").read()?; | ||
16 | |||
17 | let root = project_root(); | ||
18 | for line in diff.lines() { | ||
19 | let file = root.join(line); | ||
20 | cmd!("git update-index --add {file}").run()?; | ||
21 | } | ||
22 | |||
23 | Ok(()) | ||
24 | } | ||
25 | |||
26 | pub fn install_hook() -> Result<()> { | ||
27 | let hook_path: PathBuf = | ||
28 | format!("./.git/hooks/pre-commit{}", std::env::consts::EXE_SUFFIX).into(); | ||
29 | |||
30 | if hook_path.exists() { | ||
31 | bail!("Git hook already created"); | ||
32 | } | ||
33 | |||
34 | let me = std::env::current_exe()?; | ||
35 | fs::copy(me, hook_path)?; | ||
36 | |||
37 | Ok(()) | ||
38 | } | ||
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 63556476d..d8d86fd63 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -2,14 +2,10 @@ use std::fmt::Write; | |||
2 | 2 | ||
3 | use xshell::{cmd, cp, pushd, read_dir, write_file}; | 3 | use xshell::{cmd, cp, pushd, read_dir, write_file}; |
4 | 4 | ||
5 | use crate::{codegen, date_iso, is_release_tag, project_root, Mode, Result}; | 5 | use crate::{codegen, date_iso, flags, is_release_tag, project_root, Mode, Result}; |
6 | 6 | ||
7 | pub struct ReleaseCmd { | 7 | impl flags::Release { |
8 | pub dry_run: bool, | 8 | pub(crate) fn run(self) -> Result<()> { |
9 | } | ||
10 | |||
11 | impl ReleaseCmd { | ||
12 | pub fn run(self) -> Result<()> { | ||
13 | if !self.dry_run { | 9 | if !self.dry_run { |
14 | cmd!("git switch release").run()?; | 10 | cmd!("git switch release").run()?; |
15 | cmd!("git fetch upstream --tags --force").run()?; | 11 | cmd!("git fetch upstream --tags --force").run()?; |
@@ -86,12 +82,8 @@ https://github.com/sponsors/rust-analyzer[GitHub Sponsors]. | |||
86 | } | 82 | } |
87 | } | 83 | } |
88 | 84 | ||
89 | pub struct PromoteCmd { | 85 | impl flags::Promote { |
90 | pub dry_run: bool, | 86 | pub(crate) fn run(self) -> Result<()> { |
91 | } | ||
92 | |||
93 | impl PromoteCmd { | ||
94 | pub fn run(self) -> Result<()> { | ||
95 | let _dir = pushd("../rust-rust-analyzer")?; | 87 | let _dir = pushd("../rust-rust-analyzer")?; |
96 | cmd!("git switch master").run()?; | 88 | cmd!("git switch master").run()?; |
97 | cmd!("git fetch upstream").run()?; | 89 | cmd!("git fetch upstream").run()?; |
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs new file mode 100644 index 000000000..63116ec6b --- /dev/null +++ b/xtask/src/tidy.rs | |||
@@ -0,0 +1,424 @@ | |||
1 | use std::{ | ||
2 | collections::HashMap, | ||
3 | path::{Path, PathBuf}, | ||
4 | }; | ||
5 | |||
6 | use xshell::{cmd, read_file}; | ||
7 | |||
8 | use crate::{ | ||
9 | cargo_files, | ||
10 | codegen::{self, Mode}, | ||
11 | project_root, run_rustfmt, rust_files, | ||
12 | }; | ||
13 | |||
14 | #[test] | ||
15 | fn generated_grammar_is_fresh() { | ||
16 | if let Err(error) = codegen::generate_syntax(Mode::Verify) { | ||
17 | panic!("{}. Please update it by running `cargo xtask codegen`", error); | ||
18 | } | ||
19 | } | ||
20 | |||
21 | #[test] | ||
22 | fn generated_tests_are_fresh() { | ||
23 | if let Err(error) = codegen::generate_parser_tests(Mode::Verify) { | ||
24 | panic!("{}. Please update tests by running `cargo xtask codegen`", error); | ||
25 | } | ||
26 | } | ||
27 | |||
28 | #[test] | ||
29 | fn generated_assists_are_fresh() { | ||
30 | if let Err(error) = codegen::generate_assists_tests(Mode::Verify) { | ||
31 | panic!("{}. Please update assists by running `cargo xtask codegen`", error); | ||
32 | } | ||
33 | } | ||
34 | |||
35 | #[test] | ||
36 | fn check_code_formatting() { | ||
37 | if let Err(error) = run_rustfmt(Mode::Verify) { | ||
38 | panic!("{}. Please format the code by running `cargo format`", error); | ||
39 | } | ||
40 | } | ||
41 | |||
42 | #[test] | ||
43 | fn smoke_test_docs_generation() { | ||
44 | // We don't commit docs to the repo, so we can just overwrite in tests. | ||
45 | codegen::generate_assists_docs(Mode::Overwrite).unwrap(); | ||
46 | codegen::generate_feature_docs(Mode::Overwrite).unwrap(); | ||
47 | codegen::generate_diagnostic_docs(Mode::Overwrite).unwrap(); | ||
48 | } | ||
49 | |||
50 | #[test] | ||
51 | fn check_lsp_extensions_docs() { | ||
52 | let expected_hash = { | ||
53 | let lsp_ext_rs = | ||
54 | read_file(project_root().join("crates/rust-analyzer/src/lsp_ext.rs")).unwrap(); | ||
55 | stable_hash(lsp_ext_rs.as_str()) | ||
56 | }; | ||
57 | |||
58 | let actual_hash = { | ||
59 | let lsp_extensions_md = | ||
60 | read_file(project_root().join("docs/dev/lsp-extensions.md")).unwrap(); | ||
61 | let text = lsp_extensions_md | ||
62 | .lines() | ||
63 | .find_map(|line| line.strip_prefix("lsp_ext.rs hash:")) | ||
64 | .unwrap() | ||
65 | .trim(); | ||
66 | u64::from_str_radix(text, 16).unwrap() | ||
67 | }; | ||
68 | |||
69 | if actual_hash != expected_hash { | ||
70 | panic!( | ||
71 | " | ||
72 | lsp_ext.rs was changed without touching lsp-extensions.md. | ||
73 | |||
74 | Expected hash: {:x} | ||
75 | Actual hash: {:x} | ||
76 | |||
77 | Please adjust docs/dev/lsp-extensions.md. | ||
78 | ", | ||
79 | expected_hash, actual_hash | ||
80 | ) | ||
81 | } | ||
82 | } | ||
83 | |||
84 | #[test] | ||
85 | fn rust_files_are_tidy() { | ||
86 | let mut tidy_docs = TidyDocs::default(); | ||
87 | for path in rust_files() { | ||
88 | let text = read_file(&path).unwrap(); | ||
89 | check_todo(&path, &text); | ||
90 | check_dbg(&path, &text); | ||
91 | check_trailing_ws(&path, &text); | ||
92 | deny_clippy(&path, &text); | ||
93 | tidy_docs.visit(&path, &text); | ||
94 | } | ||
95 | tidy_docs.finish(); | ||
96 | } | ||
97 | |||
98 | #[test] | ||
99 | fn cargo_files_are_tidy() { | ||
100 | for cargo in cargo_files() { | ||
101 | let mut section = None; | ||
102 | for (line_no, text) in read_file(&cargo).unwrap().lines().enumerate() { | ||
103 | let text = text.trim(); | ||
104 | if text.starts_with("[") { | ||
105 | section = Some(text); | ||
106 | continue; | ||
107 | } | ||
108 | if !section.map(|it| it.starts_with("[dependencies")).unwrap_or(false) { | ||
109 | continue; | ||
110 | } | ||
111 | let text: String = text.split_whitespace().collect(); | ||
112 | if text.contains("path=") && !text.contains("version") { | ||
113 | panic!( | ||
114 | "\ncargo internal dependencies should have version.\n\ | ||
115 | {}:{}\n", | ||
116 | cargo.display(), | ||
117 | line_no + 1 | ||
118 | ) | ||
119 | } | ||
120 | } | ||
121 | } | ||
122 | } | ||
123 | |||
124 | #[test] | ||
125 | fn check_merge_commits() { | ||
126 | let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") | ||
127 | .read() | ||
128 | .unwrap(); | ||
129 | if !stdout.is_empty() { | ||
130 | panic!( | ||
131 | " | ||
132 | Merge commits are not allowed in the history. | ||
133 | |||
134 | When updating a pull-request, please rebase your feature branch | ||
135 | on top of master by running `git rebase master`. If rebase fails, | ||
136 | you can re-apply your changes like this: | ||
137 | |||
138 | # Just look around to see the current state. | ||
139 | $ git status | ||
140 | $ git log | ||
141 | |||
142 | # Abort in-progress rebase and merges, if any. | ||
143 | $ git rebase --abort | ||
144 | $ git merge --abort | ||
145 | |||
146 | # Make the branch point to the latest commit from master, | ||
147 | # while maintaining your local changes uncommited. | ||
148 | $ git reset --soft origin/master | ||
149 | |||
150 | # Commit all changes in a single batch. | ||
151 | $ git commit -am'My changes' | ||
152 | |||
153 | # Verify that everything looks alright. | ||
154 | $ git status | ||
155 | $ git log | ||
156 | |||
157 | # Push the changes. We did a rebase, so we need `--force` option. | ||
158 | # `--force-with-lease` is a more safe (Rusty) version of `--force`. | ||
159 | $ git push --force-with-lease | ||
160 | |||
161 | # Verify that both local and remote branch point to the same commit. | ||
162 | $ git log | ||
163 | |||
164 | And don't fear to mess something up during a rebase -- you can | ||
165 | always restore the previous state using `git ref-log`: | ||
166 | |||
167 | https://github.blog/2015-06-08-how-to-undo-almost-anything-with-git/#redo-after-undo-local | ||
168 | " | ||
169 | ); | ||
170 | } | ||
171 | } | ||
172 | |||
173 | fn deny_clippy(path: &PathBuf, text: &String) { | ||
174 | let ignore = &[ | ||
175 | // The documentation in string literals may contain anything for its own purposes | ||
176 | "ide_completion/src/generated_lint_completions.rs", | ||
177 | ]; | ||
178 | if ignore.iter().any(|p| path.ends_with(p)) { | ||
179 | return; | ||
180 | } | ||
181 | |||
182 | if text.contains("\u{61}llow(clippy") { | ||
183 | panic!( | ||
184 | "\n\nallowing lints is forbidden: {}. | ||
185 | rust-analyzer intentionally doesn't check clippy on CI. | ||
186 | You can allow lint globally via `xtask clippy`. | ||
187 | See https://github.com/rust-lang/rust-clippy/issues/5537 for discussion. | ||
188 | |||
189 | ", | ||
190 | path.display() | ||
191 | ) | ||
192 | } | ||
193 | } | ||
194 | |||
195 | #[test] | ||
196 | fn check_licenses() { | ||
197 | let expected = " | ||
198 | 0BSD OR MIT OR Apache-2.0 | ||
199 | Apache-2.0 | ||
200 | Apache-2.0 OR BSL-1.0 | ||
201 | Apache-2.0 OR MIT | ||
202 | Apache-2.0/MIT | ||
203 | BSD-3-Clause | ||
204 | CC0-1.0 | ||
205 | ISC | ||
206 | MIT | ||
207 | MIT / Apache-2.0 | ||
208 | MIT OR Apache-2.0 | ||
209 | MIT OR Apache-2.0 OR Zlib | ||
210 | MIT OR Zlib OR Apache-2.0 | ||
211 | MIT/Apache-2.0 | ||
212 | Unlicense OR MIT | ||
213 | Unlicense/MIT | ||
214 | Zlib OR Apache-2.0 OR MIT | ||
215 | " | ||
216 | .lines() | ||
217 | .filter(|it| !it.is_empty()) | ||
218 | .collect::<Vec<_>>(); | ||
219 | |||
220 | let meta = cmd!("cargo metadata --format-version 1").read().unwrap(); | ||
221 | let mut licenses = meta | ||
222 | .split(|c| c == ',' || c == '{' || c == '}') | ||
223 | .filter(|it| it.contains(r#""license""#)) | ||
224 | .map(|it| it.trim()) | ||
225 | .map(|it| it[r#""license":"#.len()..].trim_matches('"')) | ||
226 | .collect::<Vec<_>>(); | ||
227 | licenses.sort(); | ||
228 | licenses.dedup(); | ||
229 | if licenses != expected { | ||
230 | let mut diff = String::new(); | ||
231 | |||
232 | diff += &format!("New Licenses:\n"); | ||
233 | for &l in licenses.iter() { | ||
234 | if !expected.contains(&l) { | ||
235 | diff += &format!(" {}\n", l) | ||
236 | } | ||
237 | } | ||
238 | |||
239 | diff += &format!("\nMissing Licenses:\n"); | ||
240 | for &l in expected.iter() { | ||
241 | if !licenses.contains(&l) { | ||
242 | diff += &format!(" {}\n", l) | ||
243 | } | ||
244 | } | ||
245 | |||
246 | panic!("different set of licenses!\n{}", diff); | ||
247 | } | ||
248 | assert_eq!(licenses, expected); | ||
249 | } | ||
250 | |||
251 | fn check_todo(path: &Path, text: &str) { | ||
252 | let need_todo = &[ | ||
253 | // This file itself obviously needs to use todo (<- like this!). | ||
254 | "tests/tidy.rs", | ||
255 | // Some of our assists generate `todo!()`. | ||
256 | "handlers/add_turbo_fish.rs", | ||
257 | "handlers/generate_function.rs", | ||
258 | // To support generating `todo!()` in assists, we have `expr_todo()` in | ||
259 | // `ast::make`. | ||
260 | "ast/make.rs", | ||
261 | // The documentation in string literals may contain anything for its own purposes | ||
262 | "ide_completion/src/generated_lint_completions.rs", | ||
263 | ]; | ||
264 | if need_todo.iter().any(|p| path.ends_with(p)) { | ||
265 | return; | ||
266 | } | ||
267 | if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") { | ||
268 | // Generated by an assist | ||
269 | if text.contains("${0:todo!()}") { | ||
270 | return; | ||
271 | } | ||
272 | |||
273 | panic!( | ||
274 | "\nTODO markers or todo! macros should not be committed to the master branch,\n\ | ||
275 | use FIXME instead\n\ | ||
276 | {}\n", | ||
277 | path.display(), | ||
278 | ) | ||
279 | } | ||
280 | } | ||
281 | |||
282 | fn check_dbg(path: &Path, text: &str) { | ||
283 | let need_dbg = &[ | ||
284 | // This file itself obviously needs to use dbg. | ||
285 | "tests/tidy.rs", | ||
286 | // Assists to remove `dbg!()` | ||
287 | "handlers/remove_dbg.rs", | ||
288 | // We have .dbg postfix | ||
289 | "ide_completion/src/completions/postfix.rs", | ||
290 | // The documentation in string literals may contain anything for its own purposes | ||
291 | "ide_completion/src/lib.rs", | ||
292 | "ide_completion/src/generated_lint_completions.rs", | ||
293 | // test for doc test for remove_dbg | ||
294 | "src/tests/generated.rs", | ||
295 | ]; | ||
296 | if need_dbg.iter().any(|p| path.ends_with(p)) { | ||
297 | return; | ||
298 | } | ||
299 | if text.contains("dbg!") { | ||
300 | panic!( | ||
301 | "\ndbg! macros should not be committed to the master branch,\n\ | ||
302 | {}\n", | ||
303 | path.display(), | ||
304 | ) | ||
305 | } | ||
306 | } | ||
307 | |||
308 | fn check_trailing_ws(path: &Path, text: &str) { | ||
309 | if is_exclude_dir(path, &["test_data"]) { | ||
310 | return; | ||
311 | } | ||
312 | for (line_number, line) in text.lines().enumerate() { | ||
313 | if line.chars().last().map(char::is_whitespace) == Some(true) { | ||
314 | panic!("Trailing whitespace in {} at line {}", path.display(), line_number) | ||
315 | } | ||
316 | } | ||
317 | } | ||
318 | |||
319 | #[derive(Default)] | ||
320 | struct TidyDocs { | ||
321 | missing_docs: Vec<String>, | ||
322 | contains_fixme: Vec<PathBuf>, | ||
323 | } | ||
324 | |||
325 | impl TidyDocs { | ||
326 | fn visit(&mut self, path: &Path, text: &str) { | ||
327 | // Test hopefully don't really need comments, and for assists we already | ||
328 | // have special comments which are source of doc tests and user docs. | ||
329 | if is_exclude_dir(path, &["tests", "test_data"]) { | ||
330 | return; | ||
331 | } | ||
332 | |||
333 | if is_exclude_file(path) { | ||
334 | return; | ||
335 | } | ||
336 | |||
337 | let first_line = match text.lines().next() { | ||
338 | Some(it) => it, | ||
339 | None => return, | ||
340 | }; | ||
341 | |||
342 | if first_line.starts_with("//!") { | ||
343 | if first_line.contains("FIXME") { | ||
344 | self.contains_fixme.push(path.to_path_buf()); | ||
345 | } | ||
346 | } else { | ||
347 | if text.contains("// Feature:") || text.contains("// Assist:") { | ||
348 | return; | ||
349 | } | ||
350 | self.missing_docs.push(path.display().to_string()); | ||
351 | } | ||
352 | |||
353 | fn is_exclude_file(d: &Path) -> bool { | ||
354 | let file_names = ["tests.rs", "famous_defs_fixture.rs"]; | ||
355 | |||
356 | d.file_name() | ||
357 | .unwrap_or_default() | ||
358 | .to_str() | ||
359 | .map(|f_n| file_names.iter().any(|name| *name == f_n)) | ||
360 | .unwrap_or(false) | ||
361 | } | ||
362 | } | ||
363 | |||
364 | fn finish(self) { | ||
365 | if !self.missing_docs.is_empty() { | ||
366 | panic!( | ||
367 | "\nMissing docs strings\n\n\ | ||
368 | modules:\n{}\n\n", | ||
369 | self.missing_docs.join("\n") | ||
370 | ) | ||
371 | } | ||
372 | |||
373 | let poorly_documented = [ | ||
374 | "hir", | ||
375 | "hir_expand", | ||
376 | "ide", | ||
377 | "mbe", | ||
378 | "parser", | ||
379 | "profile", | ||
380 | "project_model", | ||
381 | "syntax", | ||
382 | "tt", | ||
383 | "hir_ty", | ||
384 | ]; | ||
385 | |||
386 | let mut has_fixmes = | ||
387 | poorly_documented.iter().map(|it| (*it, false)).collect::<HashMap<&str, bool>>(); | ||
388 | 'outer: for path in self.contains_fixme { | ||
389 | for krate in poorly_documented.iter() { | ||
390 | if path.components().any(|it| it.as_os_str() == *krate) { | ||
391 | has_fixmes.insert(krate, true); | ||
392 | continue 'outer; | ||
393 | } | ||
394 | } | ||
395 | panic!("FIXME doc in a fully-documented crate: {}", path.display()) | ||
396 | } | ||
397 | |||
398 | for (krate, has_fixme) in has_fixmes.iter() { | ||
399 | if !has_fixme { | ||
400 | panic!("crate {} is fully documented :tada:, remove it from the list of poorly documented crates", krate) | ||
401 | } | ||
402 | } | ||
403 | } | ||
404 | } | ||
405 | |||
406 | fn is_exclude_dir(p: &Path, dirs_to_exclude: &[&str]) -> bool { | ||
407 | p.strip_prefix(project_root()) | ||
408 | .unwrap() | ||
409 | .components() | ||
410 | .rev() | ||
411 | .skip(1) | ||
412 | .filter_map(|it| it.as_os_str().to_str()) | ||
413 | .any(|it| dirs_to_exclude.contains(&it)) | ||
414 | } | ||
415 | |||
416 | #[allow(deprecated)] | ||
417 | fn stable_hash(text: &str) -> u64 { | ||
418 | use std::hash::{Hash, Hasher, SipHasher}; | ||
419 | |||
420 | let text = text.replace('\r', ""); | ||
421 | let mut hasher = SipHasher::default(); | ||
422 | text.hash(&mut hasher); | ||
423 | hasher.finish() | ||
424 | } | ||