Upgrade to edition 2024 (#121)

Author: abhinav

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "restack"
 version = "0.8.0"
-edition = "2021"
+edition = "2024"
 description = "Teaches git rebase --interactive about your branches."
 homepage = "https://github.com/abhinav/restack"
 documentation = "https://github.com/abhinav/restack/blob/main/README.md"

Cargo.toml

@@ -1 +1 @@
-1.81.0
+1.86.0

rust-toolchain

@@ -3,7 +3,7 @@
 use std::borrow::Cow;
 use std::{env, fs, path, process};
 
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 
 use crate::exec::ExitStatusExt;
 use crate::{git, restack};

src/edit.rs

@@ -4,7 +4,7 @@
 use std::io::{self, Read};
 use std::{ffi, fs, path};
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 
 mod shell;
 

src/git.rs

@@ -142,7 +142,7 @@ impl Git for Shell {
             },
         };
 
-        return match output.as_str() {
+        match output.as_str() {
             // In auto, git will pick an unused character from a pre-defined list.
             // This might be useful to support in the future.
             "auto" => anyhow::bail!(
@@ -155,7 +155,7 @@ impl Git for Shell {
             "" => Ok("#".to_string()),
 
             _ => Ok(output),
-        };
+        }
     }
 }
 
@@ -203,10 +203,12 @@ mod tests {
         // This is hacky but it's the only way to prevent
         // any other environment variables from leaking
         // into the Git subprocess
-        std::env::vars().for_each(|(k, _)| {
-            std::env::remove_var(k);
-        });
-        std::env::set_var("HOME", home);
+        unsafe {
+            std::env::vars().for_each(|(k, _)| {
+                std::env::remove_var(k);
+            });
+            std::env::set_var("HOME", home);
+        }
 
         let shell = Shell::new();
         shell.set_global_config_str("user.name", "Test User")?;

src/git/shell.rs

@@ -14,7 +14,7 @@
 
 #![warn(missing_docs)]
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 
 mod edit;
 mod exec;

src/main.rs

@@ -115,7 +115,7 @@ struct Restack<'a, O: io::Write> {
     wrote_push: bool,
 }
 
-impl<'a, O: io::Write> Restack<'a, O> {
+impl<O: io::Write> Restack<'_, O> {
     pub fn process(&mut self, line: &str) -> Result<()> {
         if line.is_empty() {
             // Empty lines delineate sections.

src/restack.rs

@@ -69,7 +69,7 @@ pub struct Fixture<'a> {
     version: Cow<'a, str>,
 }
 
-impl<'a> Debug for Fixture<'a> {
+impl Debug for Fixture<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Fixture")
             .field("tempdir", &self.tempdir.path())