fixup! Implement sync subcommand in clippy_dev

Author: flip1995

clippy_dev/src/sync.rs

@@ -6,8 +6,10 @@ use std::process::exit;
 
 use xshell::{Shell, cmd};
 
-const JOSH_FILTER: &str = ":rev(2efebd2f0c03dabbe5c3ad7b4ebfbd99238d1fb2:prefix=src/tools/clippy):/src/tools/clippy";
+const JOSH_FILTER: &str = ":rev(53d3bc02ed90eba01c5dbc5b2d0c4cabb67ffb4d:prefix=src/tools/clippy):/src/tools/clippy";
 const JOSH_PORT: &str = "42042";
+const TOOLCHAIN_TOML: &str = "rust-toolchain.toml";
+const UTILS_README: &str = "clippy_utils/README.md";
 
 fn start_josh() -> impl Drop {
     // Create a wrapper that stops it on drop.
@@ -90,28 +92,37 @@ pub fn rustc_pull() {
     const MERGE_COMMIT_MESSAGE: &str = "Merge from rustc";
 
     let sh = Shell::new().expect("failed to create shell");
-    // sh.change_dir(clippy_project_root());
 
     assert_clean_repo(&sh);
 
     // Update rust-toolchain file
     let date = Utc::now().format("%Y-%m-%d").to_string();
-    let update = &mut update_text_region_fn(
+    let toolchain_update = &mut update_text_region_fn(
         "# begin autogenerated nightly\n",
         "# end autogenerated nightly",
         |dst| {
             writeln!(dst, "channel = \"nightly-{date}\"").unwrap();
         },
     );
+    let readme_update = &mut update_text_region_fn(
+        "<!-- begin autogenerated nightly -->\n",
+        "<!-- end autogenerated nightly -->",
+        |dst| {
+            writeln!(dst, "```\nnightly-{date}\n```").unwrap();
+        },
+    );
 
     let mut updater = FileUpdater::default();
-    updater.update_file("rust-toolchain.toml", update);
-    updater.update_file("clippy_utils/README.md", update);
+    updater.update_file(TOOLCHAIN_TOML, toolchain_update);
+    updater.update_file(UTILS_README, readme_update);
 
     let message = format!("Bump nightly version -> {date}");
-    cmd!(sh, "git commit rust-toolchain --no-verify -m {message}")
-        .run()
-        .expect("FAILED to commit rust-toolchain file, something went wrong");
+    cmd!(
+        sh,
+        "git commit --no-verify -m {message} -- {TOOLCHAIN_TOML} {UTILS_README}"
+    )
+    .run()
+    .expect("FAILED to commit rust-toolchain.toml file, something went wrong");
 
     let commit = rustc_hash();
 
@@ -160,7 +171,6 @@ pub(crate) const PUSH_PR_DESCRIPTION: &str = "Sync from Clippy commit:";
 
 pub fn rustc_push(rustc_path: String, github_user: &str, branch: &str, force: bool) {
     let sh = Shell::new().expect("failed to create shell");
-    // sh.change_dir(clippy_project_root());
 
     assert_clean_repo(&sh);
 
@@ -200,7 +210,6 @@ pub fn rustc_push(rustc_path: String, github_user: &str, branch: &str, force: bo
         let _josh = start_josh();
 
         // Do the actual push.
-        // sh.change_dir(clippy_project_root());
         println!("Pushing Clippy changes...");
         cmd!(
             sh,