chore: switch to Rust 2024 edition

Author: eatradish

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 <sakiiily@aosc.io>"]

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"
 

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"
 

oma-console/src/pager.rs

@@ -1,5 +1,5 @@
 use std::{
-    io::{self, stderr, stdin, stdout, BufRead, ErrorKind, IsTerminal, Write},
+    io::{self, BufRead, ErrorKind, IsTerminal, Write, stderr, stdin, stdout},
     time::{Duration, Instant},
 };
 
@@ -8,16 +8,16 @@ use ansi_to_tui::IntoText;
 use crossterm::{
     event::{self, Event, KeyCode, KeyModifiers},
     execute,
-    terminal::{enable_raw_mode, EnterAlternateScreen},
+    terminal::{EnterAlternateScreen, enable_raw_mode},
 };
 use ratatui::{
+    Frame, Terminal,
     backend::{Backend, CrosstermBackend},
     layout::{Alignment, Constraint, Layout},
     restore,
     style::{Color, Stylize},
     text::Text,
     widgets::{Block, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState},
-    Frame, Terminal,
 };
 use termbg::Theme;
 use tracing::debug;

oma-console/src/print.rs

@@ -1,8 +1,8 @@
 use std::{borrow::Cow, collections::BTreeMap, time::Duration};
 
-use console::{style, Color, StyledObject};
+use console::{Color, StyledObject, style};
 use termbg::Theme;
-use tracing::{debug, field::Field, Level};
+use tracing::{Level, debug, field::Field};
 use tracing_subscriber::Layer;
 
 pub use termbg;

oma-console/src/writer.rs

@@ -92,11 +92,7 @@ impl Writer {
         let len = self.get_length();
 
         if let Some(limit) = self.limit_max_len {
-            if len < limit {
-                len
-            } else {
-                limit
-            }
+            if len < limit { len } else { limit }
         } else {
             len
         }

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"
 

oma-contents/examples/list_files.rs

@@ -1,4 +1,4 @@
-use oma_contents::searcher::{pure_search, Mode};
+use oma_contents::searcher::{Mode, pure_search};
 
 fn main() {
     pure_search("/var/lib/apt/lists", Mode::Files, "apt", |(pkg, file)| {

oma-contents/examples/list_files_rg.rs

@@ -1,4 +1,4 @@
-use oma_contents::searcher::{ripgrep_search, Mode};
+use oma_contents::searcher::{Mode, ripgrep_search};
 
 fn main() {
     ripgrep_search("/var/lib/apt/lists", Mode::Files, "apt", |(pkg, file)| {

oma-contents/src/parser.rs

@@ -1,4 +1,4 @@
-use winnow::{combinator::separated, token::take_till, ModalResult, Parser};
+use winnow::{ModalResult, Parser, combinator::separated, token::take_till};
 
 use crate::OmaContentsError;
 

oma-contents/src/searcher.rs

@@ -4,8 +4,8 @@ use std::{
     path::{Path, PathBuf},
     process::{Command, Stdio},
     sync::{
-        mpsc::{self, Sender},
         Arc,
+        mpsc::{self, Sender},
     },
     thread,
 };
@@ -17,7 +17,7 @@ use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use tracing::debug;
 use zstd::Decoder;
 
-use crate::{parser::parse_contents_single_line, OmaContentsError};
+use crate::{OmaContentsError, parser::parse_contents_single_line};
 
 const ZSTD_MAGIC: &[u8] = &[40, 181, 47, 253];
 const LZ4_MAGIC: &[u8] = &[0x04, 0x22, 0x4d, 0x18];

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"
 

oma-fetch/examples/downloads.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use oma_fetch::{
-    checksum::Checksum, DownloadEntry, DownloadManager, DownloadSource, DownloadSourceType, Event,
+    DownloadEntry, DownloadManager, DownloadSource, DownloadSourceType, Event, checksum::Checksum,
 };
 use reqwest::ClientBuilder;
 

oma-fetch/src/download.rs

@@ -10,11 +10,11 @@ use std::{
 
 use async_compression::futures::bufread::{BzDecoder, GzipDecoder, XzDecoder, ZstdDecoder};
 use bon::Builder;
-use futures::{io::BufReader, AsyncRead, TryStreamExt};
+use futures::{AsyncRead, TryStreamExt, io::BufReader};
 use oma_utils::url_no_escape::url_no_escape;
 use reqwest::{
-    header::{HeaderValue, ACCEPT_RANGES, CONTENT_LENGTH, RANGE},
     Client, Method, RequestBuilder,
+    header::{ACCEPT_RANGES, CONTENT_LENGTH, HeaderValue, RANGE},
 };
 use snafu::{ResultExt, Snafu};
 use tokio::{

oma-fetch/src/lib.rs

@@ -1,6 +1,6 @@
 use std::{cmp::Ordering, path::PathBuf, time::Duration};
 
-use bon::{builder, Builder};
+use bon::{Builder, builder};
 use checksum::Checksum;
 use download::{EmptySource, SingleDownloader, SuccessSummary};
 use futures::{Future, StreamExt};

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"
 

oma-history/src/lib.rs

@@ -60,7 +60,7 @@ pub fn connect_db<P: AsRef<Path>>(db_path: P, write: bool) -> HistoryResult<Conn
         Ok(conn) => conn,
         Err(e) => match e {
             Error::SqliteFailure(err, _) if [1, 14].contains(&err.extended_code) => {
-                return Err(HistoryError::HistoryEmpty)
+                return Err(HistoryError::HistoryEmpty);
             }
             e => return Err(HistoryError::ConnectError(e)),
         },
@@ -304,7 +304,7 @@ pub fn list_history(conn: &Connection) -> HistoryResult<Vec<HistoryEntry>> {
         Ok(stmt) => stmt,
         Err(e) => match e {
             Error::SqliteFailure(err, _) if [1, 14].contains(&err.extended_code) => {
-                return Err(HistoryError::HistoryEmpty)
+                return Err(HistoryError::HistoryEmpty);
             }
             e => return Err(HistoryError::ConnectError(e)),
         },

oma-history/src/migrations.rs

@@ -5,8 +5,8 @@ use serde_json::Value;
 use tracing::{debug, info, warn};
 
 use crate::{
-    HistoryEntryInner, HistoryError, HistoryResult, InstallHistoryEntry, RemoveHistoryEntry,
-    INSERT_INSTALL_TABLE, INSERT_NEW_MAIN_TABLE, INSERT_REMOVE_DETAIL_TABLE, INSERT_REMOVE_TABLE,
+    HistoryEntryInner, HistoryError, HistoryResult, INSERT_INSTALL_TABLE, INSERT_NEW_MAIN_TABLE,
+    INSERT_REMOVE_DETAIL_TABLE, INSERT_REMOVE_TABLE, InstallHistoryEntry, RemoveHistoryEntry,
 };
 
 pub fn create_and_maybe_migration_from_oma_db_v2(conn: &Connection) -> HistoryResult<()> {
@@ -243,7 +243,9 @@ fn get_old_table(conn: &Connection) -> Result<Vec<OldTableEntry>, HistoryError>
         ) {
             Ok(i) => i,
             Err(e) => {
-                warn!("Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ...", );
+                warn!(
+                    "Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ...",
+                );
                 debug!("install packages: {}", install_packages);
                 has_fail = true;
                 continue;
@@ -277,11 +279,15 @@ fn get_old_table(conn: &Connection) -> Result<Vec<OldTableEntry>, HistoryError>
                 if !res.is_empty() {
                     res
                 } else if is_clean_configure {
-                    warn!("`oma purge' entries from the old history database cannot be migrated from unix timestamp {time}, skipping ...");
+                    warn!(
+                        "`oma purge' entries from the old history database cannot be migrated from unix timestamp {time}, skipping ..."
+                    );
                     debug!("remove packages: {}", &remove_packages);
                     continue;
                 } else {
-                    warn!("Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ...");
+                    warn!(
+                        "Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ..."
+                    );
                     debug!("remove packages: {}", &remove_packages);
                     has_fail = true;
                     continue;
@@ -292,7 +298,9 @@ fn get_old_table(conn: &Connection) -> Result<Vec<OldTableEntry>, HistoryError>
         let summary_type = match serde_json::from_str::<OldSummaryType>(&summary_type) {
             Ok(s) => s,
             Err(e) => {
-                warn!("Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ...", );
+                warn!(
+                    "Unable to migrate a history database entry from unix timestamp {time}: {e}, skipping ...",
+                );
                 debug!("summary type: {}", &summary_type);
                 has_fail = true;
                 continue;

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"
 

oma-mirror/src/lib.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use ahash::HashMap;
-use indexmap::{indexmap, IndexMap};
+use indexmap::{IndexMap, indexmap};
 use once_cell::sync::OnceCell;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};

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"
 

oma-pm-operation-type/src/lib.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use bon::{builder, Builder};
+use bon::{Builder, builder};
 use num_enum::{FromPrimitive, IntoPrimitive};
 use oma_utils::human_bytes::HumanBytes;
 use serde::{Deserialize, Serialize};

oma-pm/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oma-pm"
 version = "0.47.0"
-edition = "2021"
+edition = "2024"
 description = "APT package manager API abstraction library"
 license = "GPL-3.0-or-later"
 

oma-pm/examples/download_pkgs.rs

@@ -2,7 +2,7 @@ use std::{path::Path, thread};
 
 use apt_auth_config::AuthConfig;
 use flume::unbounded;
-use oma_fetch::{reqwest::ClientBuilder, Event};
+use oma_fetch::{Event, reqwest::ClientBuilder};
 use oma_pm::{
     apt::{AptConfig, DownloadConfig, OmaApt, OmaAptArgs, OmaAptError},
     matches::PackagesMatcher,

oma-pm/examples/install_fish.rs

@@ -3,12 +3,12 @@ use std::{io::Write, thread};
 use apt_auth_config::AuthConfig;
 use flume::unbounded;
 use oma_apt::util::{get_apt_progress_string, terminal_height, terminal_width};
-use oma_fetch::{reqwest::ClientBuilder, Event};
+use oma_fetch::{Event, reqwest::ClientBuilder};
 use oma_pm::{
+    CommitNetworkConfig,
     apt::{AptConfig, OmaApt, OmaAptArgs, OmaAptError, SummarySort},
     matches::PackagesMatcher,
     progress::InstallProgressManager,
-    CommitNetworkConfig,
 };
 
 struct MyInstallProgressManager;

oma-pm/src/apt.rs

@@ -8,26 +8,26 @@ use std::{
 
 use ahash::HashSet;
 use apt_auth_config::AuthConfig;
-use bon::{builder, Builder};
+use bon::{Builder, builder};
 pub use oma_apt::cache::Upgrade;
 use std::future::Future;
 use tokio::runtime::Runtime;
 use zbus::Connection;
 
 use oma_apt::{
+    DepFlags, Dependency, Package, PkgCurrentState, Version,
     cache::{Cache, PackageSort},
     error::{AptError, AptErrors},
     new_cache,
     progress::{AcquireProgress, InstallProgress},
     raw::IntoRawIter,
     records::RecordField,
     util::DiskSpace,
-    DepFlags, Dependency, Package, PkgCurrentState, Version,
 };
 
-use oma_fetch::{checksum::ChecksumError, reqwest::Client, Event, Summary};
+use oma_fetch::{Event, Summary, checksum::ChecksumError, reqwest::Client};
 use oma_utils::{
-    dpkg::{get_selections, is_hold, DpkgError},
+    dpkg::{DpkgError, get_selections, is_hold},
     human_bytes::HumanBytes,
 };
 
@@ -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());

oma-pm/src/commit.rs

@@ -6,7 +6,7 @@ use oma_apt::{
     progress::{AcquireProgress, InstallProgress},
     util::{apt_lock, apt_lock_inner, apt_unlock, apt_unlock_inner},
 };
-use oma_fetch::{reqwest::Client, Event, Summary};
+use oma_fetch::{Event, Summary, reqwest::Client};
 use oma_pm_operation_type::{InstallEntry, OmaOperation};
 use std::io::Write;
 use tracing::debug;

oma-pm/src/dbus.rs

@@ -1,4 +1,4 @@
-use zbus::{interface, proxy, Connection, Result};
+use zbus::{Connection, Result, interface, proxy};
 
 pub struct OmaBus {
     pub status: Status,

oma-pm/src/download.rs

@@ -2,8 +2,8 @@ use std::{borrow::Cow, future::Future, path::Path};
 
 use oma_console::console;
 use oma_fetch::{
-    checksum::Checksum, reqwest::Client, DownloadEntry, DownloadManager, DownloadSource,
-    DownloadSourceType, Event, Summary,
+    DownloadEntry, DownloadManager, DownloadSource, DownloadSourceType, Event, Summary,
+    checksum::Checksum, reqwest::Client,
 };
 use oma_pm_operation_type::InstallEntry;
 use tracing::debug;

oma-pm/src/lib.rs

@@ -34,8 +34,8 @@ pub mod matches;
 pub mod pkginfo;
 pub mod progress;
 pub mod search;
-pub use oma_apt::error::AptErrors;
 pub use oma_apt::PkgCurrentState;
+pub use oma_apt::error::AptErrors;
 pub use search::PackageStatus;
 mod commit;
 mod dbus;