Skip to content

Commit 8ccceb8

Browse files
Merge pull request #55 from andrewdavidmackenzie/libproc-rs-21
libproc-rs-21 Fix #21
2 parents dfec655 + 1557294 commit 8ccceb8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/libproc/pid_rusage.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ mod test {
235235
use std::process;
236236
let pid = process::id() as i32;
237237

238-
let res = pidrusage::<RUsageInfoV2>(pid).unwrap();
239-
println!("UUID: {:?}, Disk Read: {}, Disk Write: {}", res.ri_uuid, res.ri_diskio_bytesread, res.ri_diskio_byteswritten);
238+
let _ = pidrusage::<RUsageInfoV2>(pid).unwrap();
240239
}
241240
}

src/libproc/proc_pid.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,13 @@ pub fn pidinfo<T: PIDInfo>(_pid: i32, _arg: u64) -> Result<T, String> {
269269
/// use libproc::libproc::proc_pid::regionfilename;
270270
///
271271
/// // This checks that it can find the regionfilename of the region at address 0, of the init process with PID 1
272-
/// match regionfilename(1, 0) {
273-
/// Ok(regionfilename) => println!("Region Filename (at address = 0) of init process PID = 1 is '{}'", regionfilename),
274-
/// Err(message) => assert!(true, message)
272+
/// use libproc::libproc::proc_pid::am_root;
273+
///
274+
/// if am_root() {
275+
/// match regionfilename(1, 0) {
276+
/// Ok(regionfilename) => println!("Region Filename (at address = 0) of init process PID = 1 is '{}'", regionfilename),
277+
/// Err(message) => panic!(message)
278+
/// }
275279
/// }
276280
/// ```
277281
#[cfg(target_os = "macos")]
@@ -612,10 +616,7 @@ mod test {
612616
#[test]
613617
#[cfg(target_os = "macos")]
614618
fn libversion_test() {
615-
match libversion() {
616-
Ok((major, minor)) => println!("Major = {}, Minor = {}", major, minor),
617-
Err(message) => panic!(message)
618-
}
619+
libversion().unwrap();
619620
}
620621

621622
#[test]
@@ -644,7 +645,7 @@ mod test {
644645
Err(err) => assert!(false, "Error retrieving process name: {}", err)
645646
}
646647
} else {
647-
println!("Cannot run name_test on macos unless run as root");
648+
println!("Cannot run 'name_test' on macos unless run as root");
648649
}
649650
}
650651

0 commit comments

Comments
 (0)