From 63722ea55d61cbd803caf635893930d430e318ce Mon Sep 17 00:00:00 2001 From: Prajwal S N Date: Mon, 17 Mar 2025 14:12:11 +0530 Subject: [PATCH] fix(codegen): do not generate docs with `--check` Running `cargo codegen --check` should not generate any mdbook files, since they are ignored in the repo and used only while releasing a new copy of the documentation. Signed-off-by: Prajwal S N --- .../xtask/src/codegen/assists_doc_tests.rs | 5 +++++ .../xtask/src/codegen/diagnostics_docs.rs | 14 ++++++++------ .../xtask/src/codegen/feature_docs.rs | 6 +++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/tools/rust-analyzer/xtask/src/codegen/assists_doc_tests.rs b/src/tools/rust-analyzer/xtask/src/codegen/assists_doc_tests.rs index 1bb7845b9c86..dd55d06bd347 100644 --- a/src/tools/rust-analyzer/xtask/src/codegen/assists_doc_tests.rs +++ b/src/tools/rust-analyzer/xtask/src/codegen/assists_doc_tests.rs @@ -53,6 +53,11 @@ r#####" ); } + // Do not generate assists manual when run with `--check` + if check { + return; + } + { // Generate assists manual. Note that we do _not_ commit manual to the // git repo. Instead, `cargo xtask release` runs this test before making diff --git a/src/tools/rust-analyzer/xtask/src/codegen/diagnostics_docs.rs b/src/tools/rust-analyzer/xtask/src/codegen/diagnostics_docs.rs index 7858e9ae1b4d..4a47a5f6aa4b 100644 --- a/src/tools/rust-analyzer/xtask/src/codegen/diagnostics_docs.rs +++ b/src/tools/rust-analyzer/xtask/src/codegen/diagnostics_docs.rs @@ -10,13 +10,15 @@ use crate::{ pub(crate) fn generate(check: bool) { let diagnostics = Diagnostic::collect().unwrap(); - if !check { - let contents = - diagnostics.into_iter().map(|it| it.to_string()).collect::>().join("\n\n"); - let contents = add_preamble(crate::flags::CodegenType::DiagnosticsDocs, contents); - let dst = project_root().join("docs/book/src/diagnostics_generated.md"); - fs::write(dst, contents).unwrap(); + // Do not generate docs when run with `--check` + if check { + return; } + let contents = + diagnostics.into_iter().map(|it| it.to_string()).collect::>().join("\n\n"); + let contents = add_preamble(crate::flags::CodegenType::DiagnosticsDocs, contents); + let dst = project_root().join("docs/book/src/diagnostics_generated.md"); + fs::write(dst, contents).unwrap(); } #[derive(Debug)] diff --git a/src/tools/rust-analyzer/xtask/src/codegen/feature_docs.rs b/src/tools/rust-analyzer/xtask/src/codegen/feature_docs.rs index c10ada253376..170de5db9a7a 100644 --- a/src/tools/rust-analyzer/xtask/src/codegen/feature_docs.rs +++ b/src/tools/rust-analyzer/xtask/src/codegen/feature_docs.rs @@ -8,8 +8,12 @@ use crate::{ util::list_rust_files, }; -pub(crate) fn generate(_check: bool) { +pub(crate) fn generate(check: bool) { let features = Feature::collect().unwrap(); + // Do not generate docs when run with `--check` + if check { + return; + } let contents = features.into_iter().map(|it| it.to_string()).collect::>().join("\n\n"); let contents = add_preamble(crate::flags::CodegenType::FeatureDocs, contents); let dst = project_root().join("docs/book/src/features_generated.md");