Update MSRV to 1.88

dalance · dalance · commit 8d7a13864fb8 · 2026-02-24T10:24:26.000+09:00
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.76.0
+          toolchain: 1.88.0
           targets: x86_64-unknown-linux-gnu
       - name: Run build
         run: cargo build
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,9 +8,9 @@ categories = ["command-line-utilities"]
 license = "MIT"
 readme = "README.md"
 description = "A modern replacement for ps"
-edition = "2021"
+edition = "2024"
 exclude = ["img/*", "config/*"]
-rust-version = "1.76"
+rust-version = "1.88"
 
 [package.metadata.release]
 pre-release-commit-message = "Prepare to v{{version}}"
diff --git a/src/columns/context_sw.rs b/src/columns/context_sw.rs
@@ -30,11 +30,11 @@ impl ContextSw {
 impl Column for ContextSw {
     fn add(&mut self, proc: &ProcessInfo) {
         let (fmt_content, raw_content) = if let Some(ref status) = proc.curr_status {
-            if status.voluntary_ctxt_switches.is_some()
-                && status.nonvoluntary_ctxt_switches.is_some()
+            if let Some(voluntary_ctxt_switches) = status.voluntary_ctxt_switches
+                && let Some(nonvoluntary_ctxt_switches) = status.nonvoluntary_ctxt_switches
             {
-                let sw = status.voluntary_ctxt_switches.unwrap()
-                    + status.nonvoluntary_ctxt_switches.unwrap();
+                let sw = voluntary_ctxt_switches
+                    + nonvoluntary_ctxt_switches;
                 (bytify(sw), sw)
             } else {
                 (String::new(), 0)
diff --git a/src/columns/involuntary_context_sw.rs b/src/columns/involuntary_context_sw.rs
@@ -1,6 +1,6 @@
 use crate::process::ProcessInfo;
 use crate::util::bytify;
-use crate::{column_default, Column};
+use crate::{Column, column_default};
 use std::cmp;
 use std::collections::HashMap;
 
@@ -30,9 +30,8 @@ impl InvoluntaryContextSw {
 impl Column for InvoluntaryContextSw {
     fn add(&mut self, proc: &ProcessInfo) {
         let (fmt_content, raw_content) = if let Some(ref status) = proc.curr_status {
-            if status.nonvoluntary_ctxt_switches.is_some()
-            {
-                let sw = status.nonvoluntary_ctxt_switches.unwrap();
+            if let Some(nonvoluntary_ctxt_switches) = status.nonvoluntary_ctxt_switches {
+                let sw = nonvoluntary_ctxt_switches;
                 (bytify(sw), sw)
             } else {
                 (String::new(), 0)
diff --git a/src/columns/read_bytes.rs b/src/columns/read_bytes.rs
@@ -1,6 +1,6 @@
 use crate::process::ProcessInfo;
 use crate::util::bytify;
-use crate::{column_default, Column};
+use crate::{Column, column_default};
 use std::cmp;
 use std::collections::HashMap;
 
@@ -29,12 +29,11 @@ impl ReadBytes {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 impl Column for ReadBytes {
     fn add(&mut self, proc: &ProcessInfo) {
-        let (fmt_content, raw_content) = if proc.curr_io.is_some() && proc.prev_io.is_some() {
+        let (fmt_content, raw_content) = if let Some(curr_io) = proc.curr_io
+            && let Some(prev_io) = proc.prev_io
+        {
             let interval_ms = proc.interval.as_secs() + u64::from(proc.interval.subsec_millis());
-            let io = (proc.curr_io.as_ref().unwrap().read_bytes
-                - proc.prev_io.as_ref().unwrap().read_bytes)
-                * 1000
-                / interval_ms;
+            let io = (curr_io.read_bytes - prev_io.read_bytes) * 1000 / interval_ms;
             (bytify(io), io)
         } else {
             (String::new(), 0)
diff --git a/src/columns/voluntary_context_sw.rs b/src/columns/voluntary_context_sw.rs
@@ -1,6 +1,6 @@
 use crate::process::ProcessInfo;
 use crate::util::bytify;
-use crate::{column_default, Column};
+use crate::{Column, column_default};
 use std::cmp;
 use std::collections::HashMap;
 
@@ -30,9 +30,8 @@ impl VoluntaryContextSw {
 impl Column for VoluntaryContextSw {
     fn add(&mut self, proc: &ProcessInfo) {
         let (fmt_content, raw_content) = if let Some(ref status) = proc.curr_status {
-            if status.voluntary_ctxt_switches.is_some()
-            {
-                let sw = status.voluntary_ctxt_switches.unwrap();
+            if let Some(voluntary_ctxt_switches) = status.voluntary_ctxt_switches {
+                let sw = voluntary_ctxt_switches;
                 (bytify(sw), sw)
             } else {
                 (String::new(), 0)
@@ -51,8 +50,7 @@ impl Column for VoluntaryContextSw {
 #[cfg(target_os = "freebsd")]
 impl Column for VoluntaryContextSw {
     fn add(&mut self, proc: &ProcessInfo) {
-        let raw_content =
-            proc.curr_proc.info.rusage.nvcsw as u64;
+        let raw_content = proc.curr_proc.info.rusage.nvcsw as u64;
         let fmt_content = bytify(raw_content);
 
         self.fmt_contents.insert(proc.pid, fmt_content);
diff --git a/src/columns/write_bytes.rs b/src/columns/write_bytes.rs
@@ -1,6 +1,6 @@
 use crate::process::ProcessInfo;
 use crate::util::bytify;
-use crate::{column_default, Column};
+use crate::{Column, column_default};
 use std::cmp;
 use std::collections::HashMap;
 
@@ -29,12 +29,11 @@ impl WriteBytes {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 impl Column for WriteBytes {
     fn add(&mut self, proc: &ProcessInfo) {
-        let (fmt_content, raw_content) = if proc.curr_io.is_some() && proc.prev_io.is_some() {
+        let (fmt_content, raw_content) = if let Some(curr_io) = proc.curr_io
+            && let Some(prev_io) = proc.prev_io
+        {
             let interval_ms = proc.interval.as_secs() + u64::from(proc.interval.subsec_millis());
-            let io = (proc.curr_io.as_ref().unwrap().write_bytes
-                - proc.prev_io.as_ref().unwrap().write_bytes)
-                * 1000
-                / interval_ms;
+            let io = (curr_io.write_bytes - prev_io.write_bytes) * 1000 / interval_ms;
             (bytify(io), io)
         } else {
             (String::new(), 0)
diff --git a/src/main.rs b/src/main.rs
@@ -22,7 +22,7 @@ use console::Term;
 use std::cmp;
 use std::collections::HashMap;
 use std::fs;
-use std::io::{stdout, Read};
+use std::io::{Read, stdout};
 use std::path::PathBuf;
 use std::time::Instant;
 use unicode_width::UnicodeWidthStr;
diff --git a/src/opt.rs b/src/opt.rs
@@ -1,6 +1,6 @@
-use anyhow::{anyhow, Error};
-use clap::builder::styling::{AnsiColor, Effects, Styles};
+use anyhow::{Error, anyhow};
 use clap::CommandFactory;
+use clap::builder::styling::{AnsiColor, Effects, Styles};
 use clap::{Parser, ValueEnum};
 use clap_complete::Shell;
 use std::path::{Path, PathBuf};
diff --git a/src/process/linux.rs b/src/process/linux.rs
@@ -1,6 +1,6 @@
-use procfs::process::{FDInfo, Io, Process, Stat, Status, TasksIter};
 use procfs::ProcError;
 use procfs::ProcessCGroup;
+use procfs::process::{FDInfo, Io, Process, Stat, Status, TasksIter};
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::thread;
@@ -90,7 +90,7 @@ pub fn collect_proc(
     let mut base_tasks = HashMap::new();
     let mut ret = Vec::new();
 
-    let all_proc = if let Some(ref x) = procfs_path {
+    let all_proc = if let Some(x) = procfs_path {
         procfs::process::all_processes_with_root(x)
     } else {
         procfs::process::all_processes()
diff --git a/src/process/macos.rs b/src/process/macos.rs
@@ -1,12 +1,12 @@
 use libc::{c_int, c_void, size_t};
 use libproc::libproc::bsd_info::BSDInfo;
-use libproc::libproc::file_info::{pidfdinfo, ListFDs, ProcFDType};
+use libproc::libproc::file_info::{ListFDs, ProcFDType, pidfdinfo};
 use libproc::libproc::net_info::{InSockInfo, SocketFDInfo, SocketInfoKind, TcpSockInfo};
-use libproc::libproc::pid_rusage::{pidrusage, RUsageInfoV2};
-use libproc::libproc::proc_pid::{listpidinfo, pidinfo, ListThreads};
+use libproc::libproc::pid_rusage::{RUsageInfoV2, pidrusage};
+use libproc::libproc::proc_pid::{ListThreads, listpidinfo, pidinfo};
 use libproc::libproc::task_info::{TaskAllInfo, TaskInfo};
 use libproc::libproc::thread_info::ThreadInfo;
-use libproc::processes::{pids_by_type, ProcFilter};
+use libproc::processes::{ProcFilter, pids_by_type};
 use mach2::{boolean, vm_types};
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
diff --git a/src/process/windows.rs b/src/process/windows.rs
@@ -3,27 +3,27 @@ use chrono::{Local, NaiveDate};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ffi::c_void;
-use std::mem::{size_of, zeroed, MaybeUninit};
+use std::mem::{MaybeUninit, size_of, zeroed};
 use std::path::PathBuf;
 use std::ptr;
 use std::thread;
 use std::time::{Duration, Instant};
 use windows_sys::Win32::Foundation::{CloseHandle, FALSE, FILETIME, HANDLE, HMODULE, MAX_PATH};
 use windows_sys::Win32::Security::{
-    AdjustTokenPrivileges, GetTokenInformation, LookupAccountSidW, LookupPrivilegeValueW,
-    TokenGroups, TokenUser, PSID, SE_DEBUG_NAME, SE_PRIVILEGE_ENABLED, SID,
-    TOKEN_ADJUST_PRIVILEGES, TOKEN_GROUPS, TOKEN_PRIVILEGES, TOKEN_QUERY, TOKEN_USER,
+    AdjustTokenPrivileges, GetTokenInformation, LookupAccountSidW, LookupPrivilegeValueW, PSID,
+    SE_DEBUG_NAME, SE_PRIVILEGE_ENABLED, SID, TOKEN_ADJUST_PRIVILEGES, TOKEN_GROUPS,
+    TOKEN_PRIVILEGES, TOKEN_QUERY, TOKEN_USER, TokenGroups, TokenUser,
 };
 use windows_sys::Win32::System::Diagnostics::ToolHelp::{
-    CreateToolhelp32Snapshot, Process32First, Process32Next, PROCESSENTRY32, TH32CS_SNAPPROCESS,
+    CreateToolhelp32Snapshot, PROCESSENTRY32, Process32First, Process32Next, TH32CS_SNAPPROCESS,
 };
 use windows_sys::Win32::System::ProcessStatus::{
     EnumProcessModulesEx, GetModuleBaseNameW, GetProcessMemoryInfo, K32EnumProcesses,
     LIST_MODULES_ALL, PROCESS_MEMORY_COUNTERS, PROCESS_MEMORY_COUNTERS_EX,
 };
 use windows_sys::Win32::System::Threading::{
-    GetCurrentProcess, GetPriorityClass, GetProcessIoCounters, GetProcessTimes, OpenProcess,
-    OpenProcessToken, IO_COUNTERS, PROCESS_QUERY_INFORMATION, PROCESS_VM_READ,
+    GetCurrentProcess, GetPriorityClass, GetProcessIoCounters, GetProcessTimes, IO_COUNTERS,
+    OpenProcess, OpenProcessToken, PROCESS_QUERY_INFORMATION, PROCESS_VM_READ,
 };
 
 pub struct ProcessInfo {
diff --git a/src/term_info.rs b/src/term_info.rs
@@ -1,7 +1,7 @@
 use anyhow::Error;
 use console::Term;
-use minus::input::{self, HashedEventRegister, InputEvent};
 use minus::Pager;
+use minus::input::{self, HashedEventRegister, InputEvent};
 use std::cell::RefCell;
 use std::fmt::Write;
 
diff --git a/src/util.rs b/src/util.rs
@@ -1,8 +1,8 @@
+use crate::Opt;
 use crate::column::Column;
 use crate::columns::{ConfigColumnKind, KIND_LIST};
 use crate::config::{Config, ConfigColumnAlign, ConfigSearchCase, ConfigSearchLogic, ConfigTheme};
 use crate::opt::ArgThemeMode;
-use crate::Opt;
 use byte_unit::{Byte, UnitType};
 use std::borrow::Cow;
 use std::io;
@@ -343,7 +343,7 @@ pub fn process_new(
     pid: i32,
     procfs: &Option<std::path::PathBuf>,
 ) -> procfs::ProcResult<procfs::process::Process> {
-    if let Some(ref x) = procfs {
+    if let Some(x) = procfs {
         let path = x.join(pid.to_string());
         procfs::process::Process::new_with_root(path)
     } else {
diff --git a/src/view.rs b/src/view.rs
@@ -1,13 +1,13 @@
+use crate::Opt;
 use crate::column::Column;
 use crate::columns::*;
 use crate::config::*;
 use crate::opt::{ArgColorMode, ArgPagerMode};
 use crate::process::collect_proc;
 use crate::style::{apply_color, apply_style, color_to_column_style};
 use crate::term_info::TermInfo;
-use crate::util::{classify, find_column_kind, find_exact, find_partial, truncate, KeywordClass};
-use crate::Opt;
-use anyhow::{bail, Error};
+use crate::util::{KeywordClass, classify, find_column_kind, find_exact, find_partial, truncate};
+use anyhow::{Error, bail};
 #[cfg(not(target_os = "windows"))]
 use pager::Pager;
 use std::collections::HashMap;
@@ -154,7 +154,10 @@ impl View {
         }
 
         if slot_idx < opt.insert.len() {
-            bail!("There is not enough slot for inserting columns {:?}.\nPlease add \"Slot\" or \"MultiSlot\" to your config.\nhttps://github.com/dalance/procs#insert-column", opt.insert);
+            bail!(
+                "There is not enough slot for inserting columns {:?}.\nPlease add \"Slot\" or \"MultiSlot\" to your config.\nhttps://github.com/dalance/procs#insert-column",
+                opt.insert
+            );
         }
 
         if let Some(only_kind) = &opt.only {
diff --git a/src/watcher.rs b/src/watcher.rs
@@ -1,13 +1,13 @@
+use crate::Opt;
 use crate::config::*;
 use crate::term_info::TermInfo;
 use crate::util::get_theme;
 use crate::view::View;
-use crate::Opt;
 use anyhow::Error;
 use chrono::offset::Local;
 use getch::Getch;
 use std::collections::HashMap;
-use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::mpsc::{Receiver, Sender, channel};
 use std::thread;
 use std::time::Duration;
 
@@ -58,12 +58,14 @@ impl Watcher {
     }
 
     fn spawn_sleep(rx: Receiver<Command>, tx: Sender<Command>, interval: u64) {
-        let _ = thread::spawn(move || loop {
-            if let Ok(Command::Quit) = rx.recv() {
-                break;
+        let _ = thread::spawn(move || {
+            loop {
+                if let Ok(Command::Quit) = rx.recv() {
+                    break;
+                }
+                thread::sleep(Duration::from_millis(interval));
+                let _ = tx.send(Command::Wake);
             }
-            thread::sleep(Duration::from_millis(interval));
-            let _ = tx.send(Command::Wake);
         });
     }
 
