bump rust edition

Mic92 · Mic92 · commit ad3176c733fc · 2025-09-30T17:53:08.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cntr"
-edition = "2021"
+edition = "2024"
 description = "A container debugging tool based on FUSE"
 version = "1.6.1"
 authors = ["Jörg Thalheim <joerg@thalheim.io>"]
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1 +1,2 @@
+edition = "2024"
 reorder_imports = true
diff --git a/src/fs.rs b/src/fs.rs
@@ -306,7 +306,7 @@ impl CntrFs {
     }
 
     pub fn mount(&self, mountpoint: &Path, selinux_context: &Option<String>) -> Result<()> {
-        let context = if let Some(ref context) = selinux_context {
+        let context = if let Some(context) = selinux_context {
             format!("context=\"{}\"", context)
         } else {
             "".to_owned()
diff --git a/treefmt.nix b/treefmt.nix
@@ -10,7 +10,10 @@
         projectRootFile = "flake.lock";
 
         programs.nixfmt.enable = !pkgs.hostPlatform.isRiscV64;
-        programs.rustfmt.enable = true;
+        programs.rustfmt = {
+          enable = true;
+          edition = "2024";
+        };
       };
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ impl CntrFs {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`pub fn mount(&self, mountpoint: &Path, selinux_context: &Option<String>) -> Result<()> {`
`309`		`- let context = if let Some(ref context) = selinux_context {`
	`309`	`+ let context = if let Some(context) = selinux_context {`
`310`	`310`	`format!("context=\"{}\"", context)`
`311`	`311`	`} else {`
`312`	`312`	`"".to_owned()`