Merge #3140

3140: Start manual r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 62 insertions, 19 deletions

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index d2ef2e95b..25b64301c 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -9,7 +9,7 @@ mod ast_src;
 
 use anyhow::Context;
 use std::{
-    env, fs,
+    env,
     io::Write,
     path::{Path, PathBuf},
     process::{Command, Stdio},
@@ -17,7 +17,7 @@ use std::{
 
 use crate::{
     codegen::Mode,
-    not_bash::{pushd, run},
+    not_bash::{fs2, pushd, rm_rf, run},
 };
 
 pub use anyhow::Result;
@@ -139,7 +139,7 @@ pub fn run_pre_cache() -> Result<()> {
         }
     }
 
-    fs::remove_file("./target/.rustc_info.json")?;
+    fs2::remove_file("./target/.rustc_info.json")?;
     let to_delete = ["ra_", "heavy_test"];
     for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() {
         for entry in Path::new(dir).read_dir()? {
@@ -153,22 +153,20 @@ pub fn run_pre_cache() -> Result<()> {
     Ok(())
 }
 
-fn rm_rf(path: &Path) -> Result<()> {
-    if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
-        .with_context(|| format!("failed to remove {:?}", path))
-}
-
-pub fn run_release() -> Result<()> {
-    run!("git switch release")?;
-    run!("git fetch upstream")?;
-    run!("git reset --hard upstream/master")?;
-    run!("git push")?;
+pub fn run_release(dry_run: bool) -> Result<()> {
+    if !dry_run {
+        run!("git switch release")?;
+        run!("git fetch upstream")?;
+        run!("git reset --hard upstream/master")?;
+        run!("git push")?;
+    }
 
-    let changelog_dir = project_root().join("../rust-analyzer.github.io/thisweek/_posts");
+    let website_root = project_root().join("../rust-analyzer.github.io");
+    let changelog_dir = website_root.join("./thisweek/_posts");
 
     let today = run!("date --iso")?;
     let commit = run!("git rev-parse HEAD")?;
-    let changelog_n = fs::read_dir(changelog_dir.as_path())?.count();
+    let changelog_n = fs2::read_dir(changelog_dir.as_path())?.count();
 
     let contents = format!(
         "\
@@ -191,7 +189,9 @@ Release: release:{}[]
     );
 
     let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
-    fs::write(&path, &contents)?;
+    fs2::write(&path, &contents)?;
+
+    fs2::copy(project_root().join("./docs/user/readme.adoc"), website_root.join("manual.adoc"))?;
 
     Ok(())
 }
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 7ca727bde..a7dffe2cc 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -93,8 +93,9 @@ FLAGS:
             run_pre_cache()
         }
         "release" => {
+            let dry_run = args.contains("--dry-run");
             args.finish()?;
-            run_release()
+            run_release(dry_run)
         }
         _ => {
             eprintln!(
diff --git a/xtask/src/not_bash.rs b/xtask/src/not_bash.rs
index 56d6c6c2d..3e30e7279 100644
--- a/xtask/src/not_bash.rs
+++ b/xtask/src/not_bash.rs
@@ -4,12 +4,45 @@ use std::{
     env,
     ffi::OsStr,
     fs,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::{Command, Stdio},
 };
 
 use anyhow::{bail, Context, Result};
 
+pub mod fs2 {
+    use std::{fs, path::Path};
+
+    use anyhow::{Context, Result};
+
+    pub fn read_dir<P: AsRef<Path>>(path: P) -> Result<fs::ReadDir> {
+        let path = path.as_ref();
+        fs::read_dir(path).with_context(|| format!("Failed to read {}", path.display()))
+    }
+
+    pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> Result<()> {
+        let path = path.as_ref();
+        fs::write(path, contents).with_context(|| format!("Failed to write {}", path.display()))
+    }
+
+    pub fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<u64> {
+        let from = from.as_ref();
+        let to = to.as_ref();
+        fs::copy(from, to)
+            .with_context(|| format!("Failed to copy {} to {}", from.display(), to.display()))
+    }
+
+    pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<()> {
+        let path = path.as_ref();
+        fs::remove_file(path).with_context(|| format!("Failed to remove file {}", path.display()))
+    }
+
+    pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> Result<()> {
+        let path = path.as_ref();
+        fs::remove_dir_all(path).with_context(|| format!("Failed to remove dir {}", path.display()))
+    }
+}
+
 macro_rules! _run {
     ($($expr:expr),*) => {
         run!($($expr),*; echo = true)
@@ -41,6 +74,15 @@ pub fn rm(glob: &str) -> Result<()> {
     Ok(())
 }
 
+pub fn rm_rf(path: impl AsRef<Path>) -> Result<()> {
+    let path = path.as_ref();
+    if path.is_file() {
+        fs2::remove_file(path)
+    } else {
+        fs2::remove_dir_all(path)
+    }
+}
+
 pub fn ls(glob: &str) -> Result<Vec<PathBuf>> {
     let cwd = Env::with(|env| env.cwd());
     let mut res = Vec::new();
@@ -90,7 +132,7 @@ fn run_process_inner(cmd: &str, echo: bool) -> Result<String> {
         bail!("{}", output.status)
     }
 
-    Ok(stdout)
+    Ok(stdout.trim().to_string())
 }
 
 // FIXME: some real shell lexing here