Merge pull request rust-lang#4051 from tgross35/stable-ci

[0.2] ci: Remove tests with rust < 1.63
AkhilTThomas · Feb 5, 2025 · 9df7f87 · 9df7f87
2 parents 9f756f3 + 2f3c4aa
commit 9df7f87
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 102 deletions.
diff --git a/.github/workflows/full_ci.yml b/.github/workflows/full_ci.yml
@@ -111,13 +111,7 @@ jobs:
           - stable
           - beta
           - nightly
-          # FIXME: Disabled due to:
-          # error: failed to parse registry's information for: serde
-          # 1.13.0,
-          - 1.19.0
-          - 1.24.0
-          - 1.25.0
-          - 1.30.0
+          - 1.63.0
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
@@ -135,9 +129,10 @@ jobs:
       max-parallel: 4
       matrix:
         target:
-          - { toolchain: stable, os: macos-13 }
-          - { toolchain: beta, os: macos-13 }
-          - { toolchain: nightly, os: macos-13 }
+          - { toolchain: stable, os: macos-14 }
+          - { toolchain: beta, os: macos-14 }
+          - { toolchain: nightly, os: macos-14 }
+          - { toolchain: 1.63.0, os: macos-14 }
     runs-on: ${{ matrix.target.os }}
     steps:
       - uses: actions/checkout@v4
@@ -155,10 +150,7 @@ jobs:
       fail-fast: true
       matrix:
         toolchain:
-          - 1.19.0
-          - 1.24.0
-          - 1.25.0
-          - 1.30.0
+          - 1.63.0
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -171,12 +163,12 @@ jobs:
 
   macos:
     name: macOS
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: true
       matrix:
         target:
-          - x86_64-apple-darwin
+          - aarch64-apple-darwin
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
@@ -198,6 +190,7 @@ jobs:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
+          # FIXME: It currently causes segfaults.
           #- target: i686-pc-windows-gnu
           #  env:
           #    ARCH_BITS: 32

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -1694,6 +1694,32 @@ cfg_if! {
 
 cfg_if! {
     if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for ifconf
+        where
+            Self: Copy
+        {
+            fn eq(&self, other: &Self) -> bool {
+                let len_ptr1 = core::ptr::addr_of!(self.ifc_len);
+                let len_ptr2 = core::ptr::addr_of!(other.ifc_len);
+                let ifcu_ptr1 = core::ptr::addr_of!(self.ifc_ifcu);
+                let ifcu_ptr2 = core::ptr::addr_of!(other.ifc_ifcu);
+
+                // SAFETY: `ifconf` implements `Copy` so the reads are valid
+                let len1 = unsafe { len_ptr1.read_unaligned() };
+                let len2 = unsafe { len_ptr2.read_unaligned() };
+                let ifcu1 = unsafe { ifcu_ptr1.read_unaligned() };
+                let ifcu2 = unsafe { ifcu_ptr2.read_unaligned() };
+
+                len1 == len2 && ifcu1 == ifcu2
+            }
+        }
+        impl Eq for ifconf {}
+        impl ::fmt::Debug for ifconf {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ifconf").finish_non_exhaustive()
+            }
+        }
+
         impl PartialEq for kevent {
             fn eq(&self, other: &kevent) -> bool {
                 self.ident == other.ident
@@ -1704,6 +1730,7 @@ cfg_if! {
                     && self.udata == other.udata
             }
         }
+
         impl Eq for kevent {}
         impl fmt::Debug for kevent {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {