Auto merge of #2659 - tmandry:fix-freebsd-std, r=Amanieu
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.
This commit is contained in:
commit
2dc7cfe3f5
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.115"
|
version = "0.2.116"
|
||||||
authors = ["The Rust Project Developers"]
|
authors = ["The Rust Project Developers"]
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "libc-test"
|
name = "libc-test"
|
||||||
version = "0.2.115"
|
version = "0.2.116"
|
||||||
authors = ["The Rust Project Developers"]
|
authors = ["The Rust Project Developers"]
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
|
@ -48,8 +48,7 @@ pub type au_asid_t = ::pid_t;
|
||||||
// making the type definition system dependent. Better not bind it exactly.
|
// making the type definition system dependent. Better not bind it exactly.
|
||||||
pub type kvm_t = ::c_void;
|
pub type kvm_t = ::c_void;
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_support_flags {
|
pub enum devstat_support_flags {
|
||||||
DEVSTAT_ALL_SUPPORTED = 0x00,
|
DEVSTAT_ALL_SUPPORTED = 0x00,
|
||||||
|
@ -64,8 +63,7 @@ impl ::Clone for devstat_support_flags {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_trans_flags {
|
pub enum devstat_trans_flags {
|
||||||
DEVSTAT_NO_DATA = 0x00,
|
DEVSTAT_NO_DATA = 0x00,
|
||||||
|
@ -81,8 +79,7 @@ impl ::Clone for devstat_trans_flags {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_tag_type {
|
pub enum devstat_tag_type {
|
||||||
DEVSTAT_TAG_SIMPLE = 0x00,
|
DEVSTAT_TAG_SIMPLE = 0x00,
|
||||||
|
@ -97,8 +94,7 @@ impl ::Clone for devstat_tag_type {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_match_flags {
|
pub enum devstat_match_flags {
|
||||||
DEVSTAT_MATCH_NONE = 0x00,
|
DEVSTAT_MATCH_NONE = 0x00,
|
||||||
|
@ -113,8 +109,7 @@ impl ::Clone for devstat_match_flags {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_priority {
|
pub enum devstat_priority {
|
||||||
DEVSTAT_PRIORITY_MIN = 0x000,
|
DEVSTAT_PRIORITY_MIN = 0x000,
|
||||||
|
@ -135,8 +130,7 @@ impl ::Clone for devstat_priority {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_type_flags {
|
pub enum devstat_type_flags {
|
||||||
DEVSTAT_TYPE_DIRECT = 0x000,
|
DEVSTAT_TYPE_DIRECT = 0x000,
|
||||||
|
@ -168,8 +162,7 @@ impl ::Clone for devstat_type_flags {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_metric {
|
pub enum devstat_metric {
|
||||||
DSM_NONE,
|
DSM_NONE,
|
||||||
|
@ -226,8 +219,7 @@ impl ::Clone for devstat_metric {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash))]
|
#[cfg_attr(feature = "extra_traits", derive(Debug, Hash, PartialEq, Eq))]
|
||||||
#[derive(PartialEq, Eq)]
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum devstat_select_mode {
|
pub enum devstat_select_mode {
|
||||||
DS_SELECT_ADD,
|
DS_SELECT_ADD,
|
||||||
|
|
Loading…
Reference in a new issue