Copy book directory in xtask release step

Author: Veykril

docs/book/src/README.md

@@ -9,13 +9,12 @@ The LSP allows various code editors, like VS Code, Emacs or Vim, to
 implement semantic features like completion or goto definition by
 talking to an external language server process.
 
-To improve this document, send a pull request:  
-[https://github.com/rust-analyzer/…​/manual.adoc](https://github.com/rust-lang/rust-analyzer/blob/master/docs/user/manual.adoc)
+To improve this document, send a pull request:
+[https://github.com/rust-lang/rust-analyzer](https://github.com/rust-lang/rust-analyzer/blob/docs/book/README.md)
 
-The manual is written in [AsciiDoc](https://asciidoc.org) and includes
+The manual is written in markdown and includes
 some extra files which are generated from the source code. Run
-`cargo test` and `cargo test -p xtask` to create these and then
-`asciidoctor manual.adoc` to create an HTML copy.
+`cargo test` and `cargo test -p xtask` to create these.
 
 If you have questions about using rust-analyzer, please ask them in the
 [“IDEs and Editors”](https://users.rust-lang.org/c/ide/14) topic of Rust

docs/dev/style.md

@@ -873,7 +873,7 @@ Use `anyhow::format_err!` rather than `anyhow::anyhow`.
 **Rationale:** consistent, boring, avoids stuttering.
 
 There's no specific guidance on the formatting of error messages, see [anyhow/#209](https://github.com/dtolnay/anyhow/issues/209).
-Do not end error and context messages with `.` though. 
+Do not end error and context messages with `.` though.
 
 ## Early Returns
 
@@ -1172,7 +1172,7 @@ MergeBehavior::Last => {
 **Rationale:** writing a sentence (or maybe even a paragraph) rather just "a comment" creates a more appropriate frame of mind.
 It tricks you into writing down more of the context you keep in your head while coding.
 
-For `.md` and `.adoc` files, prefer a sentence-per-line format, don't wrap lines.
+For `.md` files prefer a sentence-per-line format, don't wrap lines.
 If the line is too long, you want to split the sentence in two :-)
 
 **Rationale:** much easier to edit the text and read the diff, see [this link](https://asciidoctor.org/docs/asciidoc-recommended-practices/#one-sentence-per-line).

xtask/src/release.rs

@@ -1,5 +1,6 @@
 mod changelog;
 
+use std::path::Path;
 use std::process::{Command, Stdio};
 use std::thread;
 use std::time::Duration;
@@ -29,7 +30,7 @@ impl flags::Release {
             cmd!(sh, "git push --force").run()?;
         }
 
-        // Generates bits of manual.adoc.
+        // Generates bits of the book.
         codegen::diagnostics_docs::generate(false);
         codegen::assists_doc_tests::generate(false);
 
@@ -53,31 +54,38 @@ impl flags::Release {
             .max()
             .unwrap_or_default();
 
-        for adoc in [
-            "manual.adoc",
-            "generated_assists.adoc",
-            "generated_config.adoc",
-            "generated_diagnostic.adoc",
-            "generated_features.adoc",
-        ] {
-            let src = project_root().join("./docs/user/").join(adoc);
-            let dst = website_root.join(adoc);
-
-            let contents = sh.read_file(src)?;
-            sh.write_file(dst, contents)?;
-        }
+        let book = project_root().join("./docs/book/");
+        let dst = website_root.join("manual");
+        copy_dir_all(sh, &book, &dst)?;
 
         let tags = cmd!(sh, "git tag --list").read()?;
         let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
 
-        let contents = changelog::get_changelog(sh, changelog_n, &commit, prev_tag, &today)?;
-        let path = changelog_dir.join(format!("{today}-changelog-{changelog_n}.adoc"));
-        sh.write_file(path, contents)?;
-
+        if let Some(contents) =
+            changelog::get_changelog(sh, changelog_n, &commit, prev_tag, &today)?
+        {
+            let path = changelog_dir.join(format!("{today}-changelog-{changelog_n}.adoc"));
+            sh.write_file(path, contents)?;
+        }
         Ok(())
     }
 }
 
+fn copy_dir_all(sh: &Shell, src: &Path, dst: &Path) -> xshell::Result<()> {
+    sh.create_dir(dst)?;
+    for path in sh.read_dir(src)? {
+        let ty = std::fs::metadata(&path).unwrap().file_type();
+        let Some(name) = path.file_name() else { continue };
+        let dst = &dst.join(name);
+        if ty.is_dir() {
+            copy_dir_all(sh, &path, dst)?;
+        } else {
+            sh.copy_file(path, dst)?;
+        }
+    }
+    Ok(())
+}
+
 // git sync implementation adapted from https://github.com/rust-lang/miri/blob/62039ac/miri-script/src/commands.rs
 impl flags::RustcPull {
     pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> {

xtask/src/release/changelog.rs

@@ -1,7 +1,6 @@
 use std::fmt::Write;
 use std::{env, iter};
 
-use anyhow::bail;
 use xshell::{cmd, Shell};
 
 pub(crate) fn get_changelog(
@@ -10,10 +9,13 @@ pub(crate) fn get_changelog(
     commit: &str,
     prev_tag: &str,
     today: &str,
-) -> anyhow::Result<String> {
+) -> anyhow::Result<Option<String>> {
     let token = match env::var("GITHUB_TOKEN") {
         Ok(token) => token,
-        Err(_) => bail!("Please obtain a personal access token from https://github.com/settings/tokens and set the `GITHUB_TOKEN` environment variable."),
+        Err(_) => {
+            eprintln!("GITHUB_TOKEN` not set, skipping changelog generation. Please obtain a personal access token from https://github.com/settings/tokens and set the `GITHUB_TOKEN` environment variable.");
+            return Ok(None);
+        }
     };
 
     let git_log = cmd!(sh, "git log {prev_tag}..HEAD --reverse").read()?;
@@ -106,7 +108,7 @@ Release: release:{today}[] (`TBD`)
 {others}
 "
     );
-    Ok(contents)
+    Ok(Some(contents))
 }
 
 #[derive(Clone, Copy)]