Auto merge of #17153 - Veykril:doc-comment-desugaring, r=Veykril
fix: Fix doc comment desugaring for proc-macros
Fixes https://github.com/rust-lang/rust-analyzer/issues/16259
diff --git a/rust-version b/rust-version
index e2a22b2..e69de29 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +0,0 @@
-688c30dc9f8434d63bddb65bd6a4d2258d19717c
diff --git a/xtask/src/release.rs b/xtask/src/release.rs
index 9dcf7af..5699053 100644
--- a/xtask/src/release.rs
+++ b/xtask/src/release.rs
@@ -95,6 +95,14 @@
if !cmd!(sh, "git status --untracked-files=no --porcelain").read()?.is_empty() {
bail!("working directory must be clean before running `cargo xtask pull`");
}
+ // This should not add any new root commits. So count those before and after merging.
+ let num_roots = || -> anyhow::Result<u32> {
+ Ok(cmd!(sh, "git rev-list HEAD --max-parents=0 --count")
+ .read()
+ .context("failed to determine the number of root commits")?
+ .parse::<u32>()?)
+ };
+ let num_roots_before = num_roots()?;
// Make sure josh is running.
let josh = start_josh()?;
@@ -126,6 +134,11 @@
.run()
.context("FAILED to merge new commits, something went wrong")?;
+ // Check that the number of roots did not increase.
+ if num_roots()? != num_roots_before {
+ bail!("Josh created a new root commit. This is probably not the history you want.");
+ }
+
drop(josh);
Ok(())
}
