3 files changed, 56 insertions, 10 deletions

diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index be218dea1..6e18a50a6 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -86,8 +86,8 @@ impl Assist {
 
 impl fmt::Display for Assist {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let before = self.before.replace("<|>", "┃"); // Unicode pseudo-graphics bar
-        let after = self.after.replace("<|>", "┃");
+        let before = self.before.replace("$0", "┃"); // Unicode pseudo-graphics bar
+        let after = self.after.replace("$0", "┃");
         writeln!(
             f,
             "[discrete]\n=== `{}`
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 3e07daae9..dec48629c 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -12,7 +12,7 @@ use std::env;
 
 use codegen::CodegenCmd;
 use pico_args::Arguments;
-use xshell::pushd;
+use xshell::{cmd, cp, pushd};
 use xtask::{
     codegen::{self, Mode},
     dist::DistCmd,
@@ -124,6 +124,13 @@ FLAGS:
             args.finish()?;
             MetricsCmd { dry_run }.run()
         }
+        "bb" => {
+            let suffix: String = args.free_from_str()?.unwrap();
+            args.finish()?;
+            cmd!("cargo build --release").run()?;
+            cp("./target/release/rust-analyzer", format!("./target/rust-analyzer-{}", suffix))?;
+            Ok(())
+        }
         _ => {
             eprintln!(
                 "\
@@ -141,7 +148,8 @@ SUBCOMMANDS:
     install
     lint
     dist
-    promote"
+    promote
+    bb"
             );
             Ok(())
         }
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d1ffb70ad..a957e36af 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -85,6 +85,7 @@ fn rust_files_are_tidy() {
     for path in rust_files(&project_root().join("crates")) {
         let text = read_file(&path).unwrap();
         check_todo(&path, &text);
+        check_dbg(&path, &text);
         check_trailing_ws(&path, &text);
         deny_clippy(&path, &text);
         tidy_docs.visit(&path, &text);
@@ -94,10 +95,9 @@ fn rust_files_are_tidy() {
 
 #[test]
 fn check_merge_commits() {
-    let stdout =
-        dbg!(cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19.."))
-            .read()
-            .unwrap();
+    let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..")
+        .read()
+        .unwrap();
     if !stdout.is_empty() {
         panic!(
             "
@@ -107,8 +107,13 @@ When updating a pull-request, please rebase your feature branch
 on top of master by running `git rebase master`. If rebase fails,
 you can re-apply your changes like this:
 
-  # Abort in-progress rebase, if any.
+  # Just look around to see the current state.
+  $ git status
+  $ git log
+
+  # Abort in-progress rebase and merges, if any.
   $ git rebase --abort
+  $ git merge --abort
 
   # Make the branch point to the latest commit from master,
   # while maintaining your local changes uncommited.
@@ -117,10 +122,17 @@ you can re-apply your changes like this:
   # Commit all changes in a single batch.
   $ git commit -am'My changes'
 
+  # Verify that everything looks alright.
+  $ git status
+  $ git log
+
   # Push the changes. We did a rebase, so we need `--force` option.
   # `--force-with-lease` is a more safe (Rusty) version of `--force`.
   $ git push --force-with-lease
 
+  # Verify that both local and remote branch point to the same commit.
+  $ git log
+
 And don't fear to mess something up during a rebase -- you can
 always restore the previous state using `git ref-log`:
 
@@ -212,7 +224,7 @@ Zlib OR Apache-2.0 OR MIT
 fn check_todo(path: &Path, text: &str) {
     let need_todo = &[
         // This file itself obviously needs to use todo (<- like this!).
-        "tests/cli.rs",
+        "tests/tidy.rs",
         // Some of our assists generate `todo!()`.
         "handlers/add_turbo_fish.rs",
         "handlers/generate_function.rs",
@@ -240,6 +252,32 @@ fn check_todo(path: &Path, text: &str) {
     }
 }
 
+fn check_dbg(path: &Path, text: &str) {
+    let need_dbg = &[
+        // This file itself obviously needs to use dbg.
+        "tests/tidy.rs",
+        // Assists to remove `dbg!()`
+        "handlers/remove_dbg.rs",
+        // We have .dbg postfix
+        "completion/src/completions/postfix.rs",
+        // The documentation in string literals may contain anything for its own purposes
+        "completion/src/lib.rs",
+        "completion/src/generated_lint_completions.rs",
+        // test for doc test for remove_dbg
+        "src/tests/generated.rs",
+    ];
+    if need_dbg.iter().any(|p| path.ends_with(p)) {
+        return;
+    }
+    if text.contains("dbg!") {
+        panic!(
+            "\ndbg! macros should not be committed to the master branch,\n\
+             {}\n",
+            path.display(),
+        )
+    }
+}
+
 fn check_trailing_ws(path: &Path, text: &str) {
     if is_exclude_dir(path, &["test_data"]) {
         return;