Skip to content

Commit

Permalink
Merge pull request #1 from GuillaumeGomez/master
Browse files Browse the repository at this point in the history
Merge
  • Loading branch information
njouanin authored Oct 31, 2023
2 parents 0248293 + cbd42c7 commit 08560e7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
# 0.26.6

* Add `Process::wait`.
* Add "Good pratice" entry into the crate level documentation and in the README.
* Add "Good practice" entry into the crate level documentation and in the README.
* Linux: More precise used memory computation.

# 0.26.5
Expand Down Expand Up @@ -224,7 +224,7 @@

# 0.24.4

* Windows: Fix `System::refresh_process` when required higher priviledges.
* Windows: Fix `System::refresh_process` when required higher privileges.

# 0.24.3

Expand Down Expand Up @@ -521,7 +521,7 @@

# 0.16.0

* Windows: show removeable drives on Windows.
* Windows: show removable drives on Windows.
* Switched to Rust 2018 edition.
* Split `SystemExt::get_version` into `SystemExt::get_kernel_version` and `SystemExt::get_os_version`.
* Windows: added support for `get_kernel_version` and `get_os_version`.
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ mod test {
if IS_SUPPORTED {
assert!(
!SUPPORTED_SIGNALS.is_empty(),
"SUPPORTED_SIGNALS shoudn't be empty on supported systems!"
"SUPPORTED_SIGNALS shouldn't be empty on supported systems!"
);
} else {
assert!(
Expand Down
1 change: 1 addition & 0 deletions src/unix/apple/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use core_foundation_sys::{
};

// Reexport items defined in either macos or ios ffi module.
#[cfg(not(target_os = "ios"))]
pub use crate::sys::inner::ffi::*;

#[link(name = "CoreFoundation", kind = "framework")]
Expand Down
2 changes: 1 addition & 1 deletion src/unix/linux/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ impl ComponentInner {
/// see below for special cases
/// - Optional: `label`
/// - Optional: `/device/model`
/// - Optional: hightest historic value in `tempN_hightest`.
/// - Optional: highest historic value in `tempN_highest`.
/// - Optional: max threshold value defined in `tempN_max`
/// - Optional: critical threshold value defined in `tempN_crit`
///
Expand Down

0 comments on commit 08560e7

Please sign in to comment.