chore: switch to Rust 2024 edition

AOSC-Dev · Feb 21, 2025 · c2eae8e · c2eae8e
1 parent 6f2a60f
commit c2eae8e
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma"
 version = "1.15.0-alpha.0"
-edition = "2021"
+edition = "2024"
 description = "User-friendly and performant package manager for APT repositories"
 license = "GPL-3.0-or-later"
 authors = ["eatradish <[email protected]>"]

diff --git a/apt-auth-config/Cargo.toml b/apt-auth-config/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "apt-auth-config"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 description = "Library to parse APT auth.conf.d configurations"
 license = "MIT"
 

diff --git a/oma-console/Cargo.toml b/oma-console/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-console"
 version = "0.26.0"
-edition = "2021"
+edition = "2024"
 description = "Console and terminal emulator handling library used by oma"
 license = "MIT"
 

diff --git a/oma-contents/Cargo.toml b/oma-contents/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-contents"
 version = "0.16.0"
-edition = "2021"
+edition = "2024"
 description = "APT Contents metadata handling library"
 license = "MIT"
 

diff --git a/oma-fetch/Cargo.toml b/oma-fetch/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-fetch"
 version = "0.25.0"
-edition = "2021"
+edition = "2024"
 description = "APT repository download routines library"
 license = "MIT"
 

diff --git a/oma-history/Cargo.toml b/oma-history/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-history"
 version = "0.5.0"
-edition = "2021"
+edition = "2024"
 description = "Package manager operations history database management library"
 license = "MIT"
 

diff --git a/oma-mirror/Cargo.toml b/oma-mirror/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-mirror"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 description = "Library to handle AOSC OS APT configuration (sources.list)"
 license = "MIT"
 

diff --git a/oma-pm-operation-type/Cargo.toml b/oma-pm-operation-type/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-pm-operation-type"
 version = "0.8.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 description = "APT package management operation abstraction library"
 

diff --git a/oma-pm/Cargo.toml b/oma-pm/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-pm"
 version = "0.46.0"
-edition = "2021"
+edition = "2024"
 description = "APT package manager API abstraction library"
 license = "GPL-3.0-or-later"
 

diff --git a/oma-pm/src/apt.rs b/oma-pm/src/apt.rs
@@ -330,7 +330,7 @@ impl OmaApt {
         }
 
         if yes || force_yes {
-            std::env::set_var("DEBIAN_FRONTEND", "noninteractive");
+            unsafe { std::env::set_var("DEBIAN_FRONTEND", "noninteractive") };
         }
 
         let dir = config.get("Dir").unwrap_or("/".to_owned());

diff --git a/oma-pm/src/progress.rs b/oma-pm/src/progress.rs
@@ -40,7 +40,7 @@ impl OmaAptInstallProgress {
         } = args;
 
         if pm.no_interactive() {
-            std::env::set_var("DEBIAN_FRONTEND", "noninteractive");
+            unsafe { std::env::set_var("DEBIAN_FRONTEND", "noninteractive") };
         }
 
         if !pm.use_pty() {

diff --git a/oma-refresh/Cargo.toml b/oma-refresh/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-refresh"
 version = "0.41.0"
-edition = "2021"
+edition = "2024"
 description = "APT repository refresh handler library"
 license = "GPL-3.0-or-later"
 

diff --git a/oma-repo-verify/Cargo.toml b/oma-repo-verify/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-repo-verify"
 version = "0.5.1"
-edition = "2021"
+edition = "2024"
 description = "Handle APT repository verify library"
 license = "MIT"
 

diff --git a/oma-topics/Cargo.toml b/oma-topics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-topics"
 version = "0.21.0"
-edition = "2021"
+edition = "2024"
 description = "AOSC OS topic (testing) repository manager used by oma"
 license = "MIT"
 

diff --git a/oma-utils/Cargo.toml b/oma-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oma-utils"
 version = "0.10.5"
-edition = "2021"
+edition = "2024"
 description = "General system API and utilities used by oma"
 license = "MIT"
 

diff --git a/src/error.rs b/src/error.rs
@@ -97,8 +97,9 @@ impl<'a> Iterator for Chain<'a> {
 
 impl DoubleEndedIterator for Chain<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
-        match &mut self.state {
-            Linked { mut next } => {
+        match &self.state {
+            Linked { next } => {
+                let mut next = next.to_owned();
                 let mut rest = Vec::new();
                 while let Some(cause) = next {
                     next = cause.source();
@@ -109,16 +110,20 @@ impl DoubleEndedIterator for Chain<'_> {
                 self.state = Buffered { rest };
                 last
             }
-            Buffered { rest } => rest.next_back(),
+            Buffered { rest } => {
+                let mut rest = rest.to_owned();
+                rest.next_back()
+            }
         }
     }
 }
 
 impl ExactSizeIterator for Chain<'_> {
     fn len(&self) -> usize {
         match &self.state {
-            Linked { mut next } => {
+            Linked { next } => {
                 let mut len = 0;
+                let mut next = next.to_owned();
                 while let Some(cause) = next {
                     next = cause.source();
                     len += 1;

diff --git a/src/main.rs b/src/main.rs
@@ -285,7 +285,7 @@ fn init_color_formatter(oma: &OhManagerAilurus, config: &Config) {
     let no_color = oma.global.color == ColorChoice::Never;
 
     if no_color {
-        env::set_var("NO_COLOR", "1");
+        unsafe { env::set_var("NO_COLOR", "1") };
     }
 
     COLOR_FORMATTER.get_or_init(|| {

diff --git a/src/tui/tui_inner.rs b/src/tui/tui_inner.rs
@@ -72,7 +72,7 @@ impl Display for Operation {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Operation::Package { name, version } => {
-                if let Some(ref ver) = version {
+                if let Some(ver) = version {
                     writeln!(f, "+ {} ({})", name, ver)?;
                 } else {
                     writeln!(f, "- {}", name)?;