From 4326144d8f0893650908af8da1651fb3e3291153 Mon Sep 17 00:00:00 2001
From: Philipp Krones <hello@philkrones.com>
Date: Fri, 15 Nov 2024 21:12:30 +0100
Subject: [PATCH] Add `cargo dev release` subcommand

Currently this only provides the feature to auto-update the versions in the
`Cargo.toml` files. With the move to Josh, a command to get beta and stable
release commits will be added.
---
 Cargo.toml                |  2 ++
 clippy_config/Cargo.toml  |  2 ++
 clippy_dev/src/lib.rs     |  1 +
 clippy_dev/src/main.rs    | 20 +++++++++++++++++++-
 clippy_dev/src/release.rs | 27 +++++++++++++++++++++++++++
 clippy_lints/Cargo.toml   |  2 ++
 clippy_utils/Cargo.toml   |  2 ++
 7 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 clippy_dev/src/release.rs

diff --git a/Cargo.toml b/Cargo.toml
index ee9c57ab8350..79b9af7b0bf3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
 name = "clippy"
+# begin autogenerated version
 version = "0.1.84"
+# end autogenerated version
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
diff --git a/clippy_config/Cargo.toml b/clippy_config/Cargo.toml
index 0cd0cabc3a6e..d1158b48e921 100644
--- a/clippy_config/Cargo.toml
+++ b/clippy_config/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
 name = "clippy_config"
+# begin autogenerated version
 version = "0.1.84"
+# end autogenerated version
 edition = "2021"
 publish = false
 
diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs
index 6505b33d3452..9280369c23b8 100644
--- a/clippy_dev/src/lib.rs
+++ b/clippy_dev/src/lib.rs
@@ -18,6 +18,7 @@ pub mod dogfood;
 pub mod fmt;
 pub mod lint;
 pub mod new_lint;
+pub mod release;
 pub mod serve;
 pub mod setup;
 pub mod sync;
diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs
index 541ce50b6e05..56ed60256f16 100644
--- a/clippy_dev/src/main.rs
+++ b/clippy_dev/src/main.rs
@@ -3,7 +3,7 @@
 #![warn(rust_2018_idioms, unused_lifetimes)]
 
 use clap::{Args, Parser, Subcommand};
-use clippy_dev::{dogfood, fmt, lint, new_lint, serve, setup, sync, update_lints, utils};
+use clippy_dev::{dogfood, fmt, lint, new_lint, release, serve, setup, sync, update_lints, utils};
 use std::convert::Infallible;
 
 fn main() {
@@ -78,6 +78,9 @@ fn main() {
         DevCommand::Sync(SyncCommand { subcommand }) => match subcommand {
             SyncSubcommand::UpdateNightly => sync::update_nightly(),
         },
+        DevCommand::Release(ReleaseCommand { subcommand }) => match subcommand {
+            ReleaseSubcommand::BumpVersion => release::bump_version(),
+        },
     }
 }
 
@@ -230,6 +233,8 @@ enum DevCommand {
     },
     /// Sync between the rust repo and the Clippy repo
     Sync(SyncCommand),
+    /// Manage Clippy releases
+    Release(ReleaseCommand),
 }
 
 #[derive(Args)]
@@ -309,3 +314,16 @@ enum SyncSubcommand {
     /// Update nightly version in rust-toolchain and `clippy_utils`
     UpdateNightly,
 }
+
+#[derive(Args)]
+struct ReleaseCommand {
+    #[command(subcommand)]
+    subcommand: ReleaseSubcommand,
+}
+
+#[derive(Subcommand)]
+enum ReleaseSubcommand {
+    #[command(name = "bump_version")]
+    /// Bump the version in the Cargo.toml files
+    BumpVersion,
+}
diff --git a/clippy_dev/src/release.rs b/clippy_dev/src/release.rs
new file mode 100644
index 000000000000..ac7551687010
--- /dev/null
+++ b/clippy_dev/src/release.rs
@@ -0,0 +1,27 @@
+use std::fmt::Write;
+use std::path::Path;
+
+use crate::utils::{UpdateMode, clippy_version, replace_region_in_file};
+
+const CARGO_TOML_FILES: [&str; 4] = [
+    "clippy_config/Cargo.toml",
+    "clippy_lints/Cargo.toml",
+    "clippy_utils/Cargo.toml",
+    "Cargo.toml",
+];
+
+pub fn bump_version() {
+    let (minor, mut patch) = clippy_version();
+    patch += 1;
+    for file in &CARGO_TOML_FILES {
+        replace_region_in_file(
+            UpdateMode::Change,
+            Path::new(file),
+            "# begin autogenerated version\n",
+            "# end autogenerated version",
+            |res| {
+                writeln!(res, "version = \"0.{minor}.{patch}\"").unwrap();
+            },
+        );
+    }
+}
diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index 63ea6faf60db..be99dcc2c7c5 100644
--- a/clippy_lints/Cargo.toml
+++ b/clippy_lints/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
 name = "clippy_lints"
+# begin autogenerated version
 version = "0.1.84"
+# end autogenerated version
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
diff --git a/clippy_utils/Cargo.toml b/clippy_utils/Cargo.toml
index fb2acf700ab3..4f95889a53a7 100644
--- a/clippy_utils/Cargo.toml
+++ b/clippy_utils/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
 name = "clippy_utils"
+# begin autogenerated version
 version = "0.1.84"
+# end autogenerated version
 edition = "2021"
 description = "Helpful tools for writing lints, provided as they are used in Clippy"
 repository = "https://github.com/rust-lang/rust-clippy"