Skip to content

Commit dd7e7e2

Browse files
sunfishcodesunfishcode
committed
Remove the compiler_builtins dependency.
This also regenerates the bindings, which fixes some issues with the sequencing of the recent PR merges. Fixes #157.
1 parent 47e68ac commit dd7e7e2

File tree

20 files changed

+56
-39
lines changed

20 files changed

+56
-39
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ rust-version = "1.63"
1414

1515
[dependencies]
1616
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
17-
compiler_builtins = { version = '0.1.49', optional = true }
1817

1918
[dev-dependencies]
2019
static_assertions = "1.1.0"
@@ -56,4 +55,4 @@ default = ["std", "general", "errno"]
5655
std = []
5756
no_std = []
5857
elf = []
59-
rustc-dep-of-std = ["core", "compiler_builtins", "no_std"]
58+
rustc-dep-of-std = ["core", "no_std"]

‎gen/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ fn main() {
176176
writeln!(cargo_toml, "elf = []").unwrap();
177177
writeln!(
178178
cargo_toml,
179-
"rustc-dep-of-std = [\"core\", \"compiler_builtins\", \"no_std\"]"
179+
"rustc-dep-of-std = [\"core\", \"no_std\"]"
180180
)
181181
.unwrap();
182182

‎src/aarch64/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3819,7 +3819,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38193819
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38203820
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38213821
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3822-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3822+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3823+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38233824
}
38243825
#[repr(u32)]
38253826
#[non_exhaustive]
@@ -5435,7 +5436,7 @@ impl nl80211_sar_specs_attrs {
54355436
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54365437
}
54375438
impl nl80211_mbssid_config_attributes {
5438-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5439+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54395440
}
54405441
impl nl80211_wiphy_radio_attrs {
54415442
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/arm/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3817,7 +3817,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38173817
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38183818
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38193819
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3820-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3820+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3821+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38213822
}
38223823
#[repr(u32)]
38233824
#[non_exhaustive]
@@ -5433,7 +5434,7 @@ impl nl80211_sar_specs_attrs {
54335434
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54345435
}
54355436
impl nl80211_mbssid_config_attributes {
5436-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5437+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54375438
}
54385439
impl nl80211_wiphy_radio_attrs {
54395440
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/csky/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3817,7 +3817,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38173817
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38183818
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38193819
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3820-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3820+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3821+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38213822
}
38223823
#[repr(u32)]
38233824
#[non_exhaustive]
@@ -5433,7 +5434,7 @@ impl nl80211_sar_specs_attrs {
54335434
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54345435
}
54355436
impl nl80211_mbssid_config_attributes {
5436-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5437+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54375438
}
54385439
impl nl80211_wiphy_radio_attrs {
54395440
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/loongarch64/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3819,7 +3819,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38193819
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38203820
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38213821
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3822-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3822+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3823+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38233824
}
38243825
#[repr(u32)]
38253826
#[non_exhaustive]
@@ -5435,7 +5436,7 @@ impl nl80211_sar_specs_attrs {
54355436
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54365437
}
54375438
impl nl80211_mbssid_config_attributes {
5438-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5439+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54395440
}
54405441
impl nl80211_wiphy_radio_attrs {
54415442
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/mips/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3827,7 +3827,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38273827
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38283828
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38293829
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3830-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3830+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3831+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38313832
}
38323833
#[repr(u32)]
38333834
#[non_exhaustive]
@@ -5443,7 +5444,7 @@ impl nl80211_sar_specs_attrs {
54435444
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54445445
}
54455446
impl nl80211_mbssid_config_attributes {
5446-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5447+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54475448
}
54485449
impl nl80211_wiphy_radio_attrs {
54495450
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/mips32r6/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3827,7 +3827,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38273827
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38283828
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38293829
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3830-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3830+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3831+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38313832
}
38323833
#[repr(u32)]
38333834
#[non_exhaustive]
@@ -5443,7 +5444,7 @@ impl nl80211_sar_specs_attrs {
54435444
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54445445
}
54455446
impl nl80211_mbssid_config_attributes {
5446-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5447+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54475448
}
54485449
impl nl80211_wiphy_radio_attrs {
54495450
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/mips64/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3829,7 +3829,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38293829
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38303830
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38313831
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3832-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3832+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3833+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38333834
}
38343835
#[repr(u32)]
38353836
#[non_exhaustive]
@@ -5445,7 +5446,7 @@ impl nl80211_sar_specs_attrs {
54455446
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54465447
}
54475448
impl nl80211_mbssid_config_attributes {
5448-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5449+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54495450
}
54505451
impl nl80211_wiphy_radio_attrs {
54515452
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

‎src/mips64r6/netlink.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3829,7 +3829,8 @@ NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY = 2,
38293829
NL80211_MBSSID_CONFIG_ATTR_INDEX = 3,
38303830
NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX = 4,
38313831
NL80211_MBSSID_CONFIG_ATTR_EMA = 5,
3832-
__NL80211_MBSSID_CONFIG_ATTR_LAST = 6,
3832+
NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID = 6,
3833+
__NL80211_MBSSID_CONFIG_ATTR_LAST = 7,
38333834
}
38343835
#[repr(u32)]
38353836
#[non_exhaustive]
@@ -5445,7 +5446,7 @@ impl nl80211_sar_specs_attrs {
54455446
pub const NL80211_SAR_ATTR_SPECS_MAX: nl80211_sar_specs_attrs = nl80211_sar_specs_attrs::NL80211_SAR_ATTR_SPECS_END_FREQ;
54465447
}
54475448
impl nl80211_mbssid_config_attributes {
5448-
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_EMA;
5449+
pub const NL80211_MBSSID_CONFIG_ATTR_MAX: nl80211_mbssid_config_attributes = nl80211_mbssid_config_attributes::NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID;
54495450
}
54505451
impl nl80211_wiphy_radio_attrs {
54515452
pub const NL80211_WIPHY_RADIO_ATTR_MAX: nl80211_wiphy_radio_attrs = nl80211_wiphy_radio_attrs::NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK;

0 commit comments

Comments
 (0)