chore(deps): cargo update (#9)

Author: grant0417

Cargo.lock

@@ -37,9 +37,9 @@ anyhow = "1.0.75"
 appkit-nsworkspace-bindings = { path = "lib/macos-utils/appkit-nsworkspace-bindings" }
 async-trait = "0.1.74"
 aws-types = "1.2.0"
-base64 = "0.22.0"
+base64 = "0.22.1"
 bytes = "1.5.0"
-bitflags = { version = "2.4.0", features = ["serde"] }
+bitflags = { version = "2.6.0", features = ["serde"] }
 bstr = "1.1.0"
 camino = { version = "1.1.3", features = ["serde1"] }
 cfg-if = "1.0.0"
@@ -50,7 +50,7 @@ clap = { version = "4.4.0", features = [
     "unicode",
     "wrap_help",
 ] }
-crossterm = "0.27.0"
+crossterm = "0.28.1"
 dashmap = "6.0.1"
 dirs = "5.0.0"
 fig_api_client = { path = "lib/fig_api_client" }
@@ -108,8 +108,8 @@ semver = { version = "1.0.16", features = ["serde"] }
 serde = { version = "1.0.197", features = ["derive", "rc"] }
 serde_json = "1.0.115"
 sha2 = "0.10.6"
-strum = { version = "0.26.1", features = ["derive"] }
-sysinfo = "0.30.11"
+strum = { version = "0.26.3", features = ["derive"] }
+sysinfo = "0.32.0"
 thiserror = "1.0.58"
 tempfile = "3.10.1"
 time = { version = "0.3.34", features = [
@@ -129,7 +129,7 @@ tracing-subscriber = { version = "0.3.17", features = [
     "time",
 ] }
 uuid = { version = "1.8.0", features = ["v4", "serde"] }
-which = "6.0.0"
+which = "6.0.3"
 whoami = "1.5.1"
 
 [workspace.lints.rust]

Cargo.toml

@@ -4,6 +4,12 @@ db-path = "~/.cargo/advisory-db"
 db-urls = ["https://github.com/rustsec/advisory-db"]
 yanked = "deny"
 
+ignore = [
+  # proc-macro-error is a transitive dependency of a number of dependencies, 
+  # this is allowed for now til the ecosystem migrates away
+  "RUSTSEC-2024-0370",
+]
+
 [licenses]
 version = 2
 private = { ignore = true }

deny.toml

@@ -694,6 +694,8 @@ async fn launch_systemd_user_service(service: SystemdUserService) -> anyhow::Res
 #[cfg(target_os = "linux")]
 #[allow(dead_code)]
 async fn launch_ibus(ctx: &Context) {
+    use std::ffi::OsString;
+
     use sysinfo::{
         ProcessRefreshKind,
         RefreshKind,
@@ -704,7 +706,8 @@ async fn launch_ibus(ctx: &Context) {
     let system = tokio::task::block_in_place(|| {
         System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()))
     });
-    if system.processes_by_name("ibus-daemon").next().is_none() {
+    let ibus_daemon = OsString::from("ibus-daemon");
+    if system.processes_by_name(&ibus_daemon).next().is_none() {
         info!("Launching ibus via systemd");
 
         match Command::new("systemctl")
@@ -1014,7 +1017,6 @@ echo "{binary_name} {version}"
     mod linux_desktop_entry_tests {
         use fig_integrations::desktop_entry::{
             AutostartIntegration,
-            global_entry_path,
             local_entry_path,
             local_icon_path,
         };

fig_desktop/src/install.rs

@@ -238,6 +238,8 @@ async fn main() {
 
 #[cfg(target_os = "linux")]
 async fn allow_multiple_running_check(current_pid: sysinfo::Pid, kill_old: bool, page: Option<String>) {
+    use std::ffi::OsString;
+
     use tracing::debug;
 
     if kill_old {
@@ -249,7 +251,8 @@ async fn allow_multiple_running_check(current_pid: sysinfo::Pid, kill_old: bool,
     let system = System::new_with_specifics(
         RefreshKind::new().with_processes(ProcessRefreshKind::new().with_user(sysinfo::UpdateKind::Always)),
     );
-    let processes = system.processes_by_exact_name(APP_PROCESS_NAME);
+    let app_process_name = OsString::from(APP_PROCESS_NAME);
+    let processes = system.processes_by_exact_name(&app_process_name);
 
     let processes = processes.collect::<Vec<_>>();
     debug!("Checking for already running desktop instance: {:?}", processes);
@@ -293,8 +296,11 @@ async fn allow_multiple_running_check(current_pid: sysinfo::Pid, kill_old: bool,
 
 #[cfg(target_os = "macos")]
 async fn allow_multiple_running_check(current_pid: sysinfo::Pid, kill_old: bool, page: Option<String>) {
+    use std::ffi::OsString;
+
+    let app_process_name = OsString::from(APP_PROCESS_NAME);
     let system = System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
-    let processes = system.processes_by_name(APP_PROCESS_NAME);
+    let processes = system.processes_by_name(&app_process_name);
 
     cfg_if::cfg_if! {
         if #[cfg(unix)] {

fig_desktop/src/main.rs

@@ -18,6 +18,11 @@ use fig_util::{
     Terminal,
 };
 use serde::Serialize;
+use sysinfo::{
+    CpuRefreshKind,
+    MemoryRefreshKind,
+    RefreshKind,
+};
 use time::OffsetDateTime;
 use time::format_description::well_known::Rfc3339;
 
@@ -97,20 +102,20 @@ pub struct SystemInfo {
 
 impl SystemInfo {
     fn new() -> SystemInfo {
-        use sysinfo::System;
-
-        let mut sys = System::new();
-        sys.refresh_cpu();
-        sys.refresh_memory();
+        let system = sysinfo::System::new_with_specifics(
+            RefreshKind::new()
+                .with_cpu(CpuRefreshKind::everything())
+                .with_memory(MemoryRefreshKind::everything()),
+        );
 
         let mut hardware_info = SystemInfo {
             os: os_version(),
             chip: None,
-            total_cores: sys.physical_core_count(),
-            memory: Some(format!("{:0.2} GB", sys.total_memory() as f32 / 2.0_f32.powi(30))),
+            total_cores: system.physical_core_count(),
+            memory: Some(format!("{:0.2} GB", system.total_memory() as f32 / 2.0_f32.powi(30))),
         };
 
-        if let Some(processor) = sys.cpus().first() {
+        if let Some(processor) = system.cpus().first() {
             hardware_info.chip = Some(processor.brand().into());
         }
 

lib/fig_diagnostic/src/lib.rs

@@ -1,3 +1,4 @@
+use std::ffi::OsString;
 use std::sync::{
     Arc,
     Mutex,
@@ -38,13 +39,9 @@ impl SysInfo {
         use inner::Inner;
         match &self.0 {
             Inner::Real => {
-                use sysinfo::ProcessRefreshKind;
-
-                let mut s = sysinfo::System::new();
-                s.refresh_processes_specifics(ProcessRefreshKind::new());
-
-                let x = s.processes_by_name(name).next().is_some();
-                x
+                let system = sysinfo::System::new_all();
+                let is_running = system.processes_by_name(&OsString::from(name)).next().is_some();
+                is_running
             },
             Inner::Fake(fake) => fake.lock().unwrap().process_names.contains(name),
         }

lib/fig_os_shim/src/sysinfo.rs

@@ -527,11 +527,10 @@ mod tests {
     }
 
     macro_rules! assert_directory {
-        ($value:expr, @ $snapshot:literal) => {
+        ($value:expr, @$snapshot:literal) => {
             insta::assert_snapshot!(
-                insta::_macro_support::ReferenceValue::Inline($snapshot),
                 sanitized_directory_path($value),
-                stringify!(sanitized_directory_path($value))
+                @$snapshot,
             )
         };
     }

lib/fig_util/src/directories.rs

@@ -11,7 +11,8 @@ import logger from "loglevel";
 export const cleanOutput = (output: string) =>
   output
     .replace(/\r\n/g, "\n") // Replace carriage returns with just a normal return
-    .replace(/\033\[\?25h/g, "") // removes cursor character if present
+    // eslint-disable-next-line no-control-regex
+    .replace(/\x1b\[\?25h/g, "") // removes cursor character if present
     .replace(/^\n+/, "") // strips new lines from start of output
     .replace(/\n+$/, ""); // strips new lines from end of output
 

packages/api-bindings-wrappers/src/executeCommand.ts

@@ -256,14 +256,17 @@ impl DoctorCheck<LinuxContext> for IBusCheck {
     }
 
     async fn check(&self, _: &LinuxContext) -> Result<(), DoctorError> {
+        use std::ffi::OsString;
+
         use sysinfo::{
             ProcessRefreshKind,
             RefreshKind,
         };
 
         let system = sysinfo::System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
+        let ibus_daemon = OsString::from("ibus-daemon");
 
-        if system.processes_by_exact_name("ibus-daemon").next().is_none() {
+        if system.processes_by_exact_name(&ibus_daemon).next().is_none() {
             return Err(doctor_fix!({
                 reason: "ibus-daemon is not running",
                 fix: || {