Skip to content

Commit 9df7f87

Browse files
tgross35AkhilTThomas
authored andcommitted
Merge pull request rust-lang#4051 from tgross35/stable-ci
[0.2] ci: Remove tests with rust < 1.63
2 parents 9f756f3 + 2f3c4aa commit 9df7f87

File tree

3 files changed

+36
-102
lines changed

3 files changed

+36
-102
lines changed

.github/workflows/full_ci.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,7 @@ jobs:
111111
- stable
112112
- beta
113113
- nightly
114-
# FIXME: Disabled due to:
115-
# error: failed to parse registry's information for: serde
116-
# 1.13.0,
117-
- 1.19.0
118-
- 1.24.0
119-
- 1.25.0
120-
- 1.30.0
114+
- 1.63.0
121115
steps:
122116
- uses: actions/checkout@v4
123117
- name: Setup Rust toolchain
@@ -135,9 +129,10 @@ jobs:
135129
max-parallel: 4
136130
matrix:
137131
target:
138-
- { toolchain: stable, os: macos-13 }
139-
- { toolchain: beta, os: macos-13 }
140-
- { toolchain: nightly, os: macos-13 }
132+
- { toolchain: stable, os: macos-14 }
133+
- { toolchain: beta, os: macos-14 }
134+
- { toolchain: nightly, os: macos-14 }
135+
- { toolchain: 1.63.0, os: macos-14 }
141136
runs-on: ${{ matrix.target.os }}
142137
steps:
143138
- uses: actions/checkout@v4
@@ -155,10 +150,7 @@ jobs:
155150
fail-fast: true
156151
matrix:
157152
toolchain:
158-
- 1.19.0
159-
- 1.24.0
160-
- 1.25.0
161-
- 1.30.0
153+
- 1.63.0
162154
- stable
163155
steps:
164156
- uses: actions/checkout@v4
@@ -171,12 +163,12 @@ jobs:
171163

172164
macos:
173165
name: macOS
174-
runs-on: macos-13
166+
runs-on: macos-14
175167
strategy:
176168
fail-fast: true
177169
matrix:
178170
target:
179-
- x86_64-apple-darwin
171+
- aarch64-apple-darwin
180172
steps:
181173
- uses: actions/checkout@v4
182174
- name: Setup Rust toolchain
@@ -198,6 +190,7 @@ jobs:
198190
ARCH_BITS: 64
199191
ARCH: x86_64
200192
- target: x86_64-pc-windows-msvc
193+
# FIXME: It currently causes segfaults.
201194
#- target: i686-pc-windows-gnu
202195
# env:
203196
# ARCH_BITS: 32

.github/workflows/main.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/unix/bsd/apple/mod.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,32 @@ cfg_if! {
16941694

16951695
cfg_if! {
16961696
if #[cfg(feature = "extra_traits")] {
1697+
impl PartialEq for ifconf
1698+
where
1699+
Self: Copy
1700+
{
1701+
fn eq(&self, other: &Self) -> bool {
1702+
let len_ptr1 = core::ptr::addr_of!(self.ifc_len);
1703+
let len_ptr2 = core::ptr::addr_of!(other.ifc_len);
1704+
let ifcu_ptr1 = core::ptr::addr_of!(self.ifc_ifcu);
1705+
let ifcu_ptr2 = core::ptr::addr_of!(other.ifc_ifcu);
1706+
1707+
// SAFETY: `ifconf` implements `Copy` so the reads are valid
1708+
let len1 = unsafe { len_ptr1.read_unaligned() };
1709+
let len2 = unsafe { len_ptr2.read_unaligned() };
1710+
let ifcu1 = unsafe { ifcu_ptr1.read_unaligned() };
1711+
let ifcu2 = unsafe { ifcu_ptr2.read_unaligned() };
1712+
1713+
len1 == len2 && ifcu1 == ifcu2
1714+
}
1715+
}
1716+
impl Eq for ifconf {}
1717+
impl ::fmt::Debug for ifconf {
1718+
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
1719+
f.debug_struct("ifconf").finish_non_exhaustive()
1720+
}
1721+
}
1722+
16971723
impl PartialEq for kevent {
16981724
fn eq(&self, other: &kevent) -> bool {
16991725
self.ident == other.ident
@@ -1704,6 +1730,7 @@ cfg_if! {
17041730
&& self.udata == other.udata
17051731
}
17061732
}
1733+
17071734
impl Eq for kevent {}
17081735
impl fmt::Debug for kevent {
17091736
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

0 commit comments

Comments
 (0)