d3dbf9c194
* There are a few needless borrows that don't seem to be needed. I even did a quick assembly comparison and posted a q to stackoveflow on it. See [here](https://stackoverflow.com/questions/74910196/advantages-of-pass-by-ref-val-with-impl-intoiteratoritem-impl-asrefstr) * removed several `let _ = ...` when they don't look necessary (even a few ones that were not suggested by clippy (?)) * there were a few `then(|| ctor{})` that clippy suggested to replace with `then_some(ctor{})` -- seems reasonable? * some unneeded assignment+return - keep the code a bit leaner * a few `writeln!` instead of `write!`, or even consolidate write! * a nice optimization to use `ch.is_ascii_digit` instead of `ch.is_digit(10)`
97 lines
3.6 KiB
Rust
97 lines
3.6 KiB
Rust
mod changelog;
|
|
|
|
use xshell::{cmd, Shell};
|
|
|
|
use crate::{date_iso, flags, is_release_tag, project_root};
|
|
|
|
impl flags::Release {
|
|
pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> {
|
|
if !self.dry_run {
|
|
cmd!(sh, "git switch release").run()?;
|
|
cmd!(sh, "git fetch upstream --tags --force").run()?;
|
|
cmd!(sh, "git reset --hard tags/nightly").run()?;
|
|
// The `release` branch sometimes has a couple of cherry-picked
|
|
// commits for patch releases. If that's the case, just overwrite
|
|
// it. As we are setting `release` branch to an up-to-date `nightly`
|
|
// tag, this shouldn't be problematic in general.
|
|
//
|
|
// Note that, as we tag releases, we don't worry about "losing"
|
|
// commits -- they'll be kept alive by the tag. More generally, we
|
|
// don't care about historic releases all that much, it's fine even
|
|
// to delete old tags.
|
|
cmd!(sh, "git push --force").run()?;
|
|
}
|
|
|
|
// Generates bits of manual.adoc.
|
|
cmd!(sh, "cargo test -p ide-assists -p ide-diagnostics -p rust-analyzer -- sourcegen_")
|
|
.run()?;
|
|
|
|
let website_root = project_root().join("../rust-analyzer.github.io");
|
|
{
|
|
let _dir = sh.push_dir(&website_root);
|
|
cmd!(sh, "git switch src").run()?;
|
|
cmd!(sh, "git pull").run()?;
|
|
}
|
|
let changelog_dir = website_root.join("./thisweek/_posts");
|
|
|
|
let today = date_iso(sh)?;
|
|
let commit = cmd!(sh, "git rev-parse HEAD").read()?;
|
|
let changelog_n = sh
|
|
.read_dir(changelog_dir.as_path())?
|
|
.into_iter()
|
|
.filter_map(|p| p.file_stem().map(|s| s.to_string_lossy().to_string()))
|
|
.filter_map(|s| s.splitn(5, '-').last().map(|n| n.replace('-', ".")))
|
|
.filter_map(|s| s.parse::<f32>().ok())
|
|
.map(|n| 1 + n.floor() as usize)
|
|
.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 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)?;
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl flags::Promote {
|
|
pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> {
|
|
let _dir = sh.push_dir("../rust-rust-analyzer");
|
|
cmd!(sh, "git switch master").run()?;
|
|
cmd!(sh, "git fetch upstream").run()?;
|
|
cmd!(sh, "git reset --hard upstream/master").run()?;
|
|
|
|
let date = date_iso(sh)?;
|
|
let branch = format!("rust-analyzer-{date}");
|
|
cmd!(sh, "git switch -c {branch}").run()?;
|
|
cmd!(sh, "git subtree pull -m ':arrow_up: rust-analyzer' -P src/tools/rust-analyzer rust-analyzer release").run()?;
|
|
|
|
if !self.dry_run {
|
|
cmd!(sh, "git push -u origin {branch}").run()?;
|
|
cmd!(
|
|
sh,
|
|
"xdg-open https://github.com/matklad/rust/pull/new/{branch}?body=r%3F%20%40ghost"
|
|
)
|
|
.run()?;
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|