diff options
| author | bors <bors@rust-lang.org> | 2022-01-28 18:17:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-28 18:17:43 +0000 |
| commit | 2dc7cfe3f5e0f8b8fa92e73cde7f06c85a754de4 (patch) | |
| tree | d6568b9b4cbe2de59a9cc4b770145a7e6d3dbc7e | |
| parent | ba811307677fb69689e20a8598358f1acae8214a (diff) | |
| parent | e5f0e5fcfe991abafab73a82d7b227780fca1c3b (diff) | |
| download | rust-libc-2dc7cfe3f5e0f8b8fa92e73cde7f06c85a754de4.tar.gz | |
Auto merge of #2659 - tmandry:fix-freebsd-std, r=Amanieu0.2.116
Gate PartialEq and Eq on freebsd objects behind extra_traits
This fixes the failure in https://github.com/rust-lang/rust/pull/93351#issuecomment-1024049582.
These derives were recently added in #2565. Other PartialEq/Eq derives in the project (and this file) are all behind the `extra_traits` gate.
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | libc-test/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 24 |
3 files changed, 10 insertions, 18 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" 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, |