Update sysinfo to 0.30 (#1753)

pgcentralfoundation · Jul 5, 2024 · 78d8de5 · 78d8de5
1 parent 80ea231
commit 78d8de5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pgrx-tests/Cargo.toml b/pgrx-tests/Cargo.toml
@@ -65,7 +65,7 @@ thiserror.workspace = true
 paste = "1"
 postgres = "0.19.7"
 proptest = { version = "1", optional = true }
-sysinfo = "0.29.10"
+sysinfo = "0.30.10"
 rand = "0.8.5"
 
 [dependencies.pgrx] # Not unified in workspace due to default-features key

diff --git a/pgrx-tests/src/framework.rs b/pgrx-tests/src/framework.rs
@@ -24,7 +24,7 @@ use std::io::{BufRead, BufReader, Write};
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Duration;
-use sysinfo::{Pid, ProcessExt, System, SystemExt};
+use sysinfo::{Pid, System};
 
 mod shutdown;
 pub use shutdown::add_shutdown_hook;
@@ -868,7 +868,7 @@ fn get_cargo_args() -> Vec<String> {
     while let Some(process) = system.process(pid) {
         // only if it's "cargo"... (This works for now, but just because `cargo`
         // is at the end of the path. How *should* this handle `CARGO`?)
-        if process.exe().ends_with("cargo") {
+        if process.exe().is_some_and(|p| p.ends_with("cargo")) {
             // ... and only if it's "cargo test"...
             if process.cmd().iter().any(|arg| arg == "test")
                 && !process.cmd().iter().any(|arg| arg == "pgrx")