Skip to content

Commit 7051191

Browse files
authored
Merge pull request #3881 from tgross35/msrv-1.63
Lower the MSRV to 1.63
2 parents 5431bdb + bfc1b6f commit 7051191

File tree

4 files changed

+15
-30
lines changed

4 files changed

+15
-30
lines changed

.github/workflows/full_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
stable,
155155
beta,
156156
nightly,
157-
1.71.0,
157+
1.63.0,
158158
]
159159
steps:
160160
- uses: actions/checkout@v4
@@ -179,7 +179,7 @@ jobs:
179179
- { toolchain: stable, os: macos-14 }
180180
- { toolchain: beta, os: macos-14 }
181181
- { toolchain: nightly, os: macos-14 }
182-
- { toolchain: 1.71.0, os: macos-14 }
182+
- { toolchain: 1.63.0, os: macos-14 }
183183
runs-on: ${{ matrix.target.os }}
184184
steps:
185185
- uses: actions/checkout@v4
@@ -200,7 +200,7 @@ jobs:
200200
fail-fast: true
201201
matrix:
202202
toolchain: [
203-
1.71.0,
203+
1.63.0,
204204
stable,
205205
]
206206
steps:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml"]
1414
description = """
1515
Raw FFI bindings to platform libraries like libc.
1616
"""
17-
rust-version = "1.71.0"
17+
rust-version = "1.63.0"
1818

1919
[package.metadata.docs.rs]
2020
features = ["const-extern-fn", "extra_traits"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ libc = "0.2"
5252

5353
## Rust version support
5454

55-
The minimum supported Rust toolchain version is currently **Rust 1.71.0**
55+
The minimum supported Rust toolchain version is currently **Rust 1.63.0**
5656
(libc does not currently have any policy regarding changes to the minimum
5757
supported Rust version; such policy is a work in progress).
5858

src/unix/bsd/apple/mod.rs

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,12 +1089,6 @@ s! {
10891089
pub nativeattr: attribute_set_t,
10901090
}
10911091

1092-
#[repr(packed(4))]
1093-
pub struct ifconf {
1094-
pub ifc_len: ::c_int,
1095-
pub ifc_ifcu: __c_anonymous_ifc_ifcu,
1096-
}
1097-
10981092
#[repr(align(8))]
10991093
pub struct tcp_connection_info {
11001094
pub tcpi_state: u8,
@@ -1211,6 +1205,12 @@ s! {
12111205
}
12121206

12131207
s_no_extra_traits! {
1208+
#[repr(packed(4))]
1209+
pub struct ifconf {
1210+
pub ifc_len: ::c_int,
1211+
pub ifc_ifcu: __c_anonymous_ifc_ifcu,
1212+
}
1213+
12141214
#[repr(packed(4))]
12151215
pub struct kevent {
12161216
pub ident: ::uintptr_t,
@@ -3086,30 +3086,15 @@ cfg_if! {
30863086
}
30873087
}
30883088

3089-
impl Eq for __c_anonymous_ifc_ifcu {}
3090-
3091-
impl PartialEq for __c_anonymous_ifc_ifcu {
3092-
fn eq(&self, other: &__c_anonymous_ifc_ifcu) -> bool {
3093-
unsafe {
3094-
self.ifcu_buf == other.ifcu_buf &&
3095-
self.ifcu_req == other.ifcu_req
3096-
}
3089+
impl ::fmt::Debug for ifconf{
3090+
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
3091+
f.debug_struct("ifconf").finish_non_exhaustive()
30973092
}
30983093
}
30993094

31003095
impl ::fmt::Debug for __c_anonymous_ifc_ifcu {
31013096
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
3102-
f.debug_struct("ifc_ifcu")
3103-
.field("ifcu_buf", unsafe { &self.ifcu_buf })
3104-
.field("ifcu_req", unsafe { &self.ifcu_req })
3105-
.finish()
3106-
}
3107-
}
3108-
3109-
impl ::hash::Hash for __c_anonymous_ifc_ifcu {
3110-
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
3111-
unsafe { self.ifcu_buf.hash(state) };
3112-
unsafe { self.ifcu_req.hash(state) };
3097+
f.debug_struct("ifc_ifcu").finish_non_exhaustive()
31133098
}
31143099
}
31153100

0 commit comments

Comments
 (0)