From f1f325edd7c3b489d43ad993b0df4232063c31b3 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Fri, 28 Jan 2022 17:26:02 +0000 Subject: Gate PartialEq and Eq on freebsd objects behind extra_traits --- src/unix/bsd/freebsdlike/freebsd/mod.rs | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index a0074468c6..63399a016e 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -48,8 +48,7 @@ pub type au_asid_t = ::pid_t; // making the type definition system dependent. Better not bind it exactly. pub type kvm_t = ::c_void; -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_support_flags { DEVSTAT_ALL_SUPPORTED = 0x00, @@ -64,8 +63,7 @@ impl ::Clone for devstat_support_flags { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_trans_flags { DEVSTAT_NO_DATA = 0x00, @@ -81,8 +79,7 @@ impl ::Clone for devstat_trans_flags { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_tag_type { DEVSTAT_TAG_SIMPLE = 0x00, @@ -97,8 +94,7 @@ impl ::Clone for devstat_tag_type { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_match_flags { DEVSTAT_MATCH_NONE = 0x00, @@ -113,8 +109,7 @@ impl ::Clone for devstat_match_flags { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_priority { DEVSTAT_PRIORITY_MIN = 0x000, @@ -135,8 +130,7 @@ impl ::Clone for devstat_priority { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_type_flags { DEVSTAT_TYPE_DIRECT = 0x000, @@ -168,8 +162,7 @@ impl ::Clone for devstat_type_flags { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_metric { DSM_NONE, @@ -226,8 +219,7 @@ impl ::Clone for devstat_metric { } } -#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))] -#[derive(PartialEq, Eq)] +#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))] #[repr(u32)] pub enum devstat_select_mode { DS_SELECT_ADD, -- cgit v1.2.1 From e5f0e5fcfe991abafab73a82d7b227780fca1c3b Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Fri, 28 Jan 2022 17:30:10 +0000 Subject: Bump version to 0.2.116 --- Cargo.toml | 2 +- libc-test/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c532e3377a..fa8dbf4a1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libc" -version = "0.2.115" +version = "0.2.116" authors = ["The Rust Project Developers"] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml index 639dfe6983..c750c76f78 100644 --- a/libc-test/Cargo.toml +++ b/libc-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libc-test" -version = "0.2.115" +version = "0.2.116" authors = ["The Rust Project Developers"] license = "MIT OR Apache-2.0" build = "build.rs" -- cgit v1.2.1