Merge pull request #4166 from tgross35/backport-crate-prelude

[0.2] Backports

Author: tgross35

.git-blame-ignore-revs

@@ -1,5 +1,6 @@
 # Format macro bodies
 50f26e08e146b7e9c7d1af9614486eba327d1e31
 
-# Automated changes to upgrade to the 2021 edition
+# Automated changes related to the 2021 edition upgrade
 643182f7da26cedb09349b8bb3735c2e58ba24e6
+108310db03e7db35ef48a902d9ce9a88ab8f9b77

.github/workflows/ci.yaml

@@ -18,6 +18,7 @@ jobs:
   style_check:
     name: Style check
     runs-on: ubuntu-24.04
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
@@ -36,6 +37,7 @@ jobs:
           - toolchain: beta
             os: ubuntu-24.04
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
     env:
       TOOLCHAIN: ${{ matrix.toolchain }}
     steps:
@@ -73,6 +75,7 @@ jobs:
           - target: i686-pc-windows-msvc
             os: windows-2022
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
     steps:
@@ -123,6 +126,7 @@ jobs:
           # FIXME: It seems some items in `src/unix/mod.rs`
           # aren't defined on redox actually.
           # - x86_64-unknown-redox
+    timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
     steps:
@@ -141,6 +145,7 @@ jobs:
       matrix:
         target:
           - x86_64-pc-solaris
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4
       - name: test on Solaris
@@ -164,6 +169,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       TOOLCHAIN: nightly
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain

build.rs

@@ -49,13 +49,20 @@ fn main() {
     //
     // On CI, we detect the actual FreeBSD version and match its ABI exactly,
     // running tests to ensure that the ABI is correct.
-    let which_freebsd = if libc_ci {
+    println!("cargo:rerun-if-env-changed=RUST_LIBC_UNSTABLE_FREEBSD_VERSION");
+    // Allow overriding the default version for testing
+    let which_freebsd = if let Ok(version) = env::var("RUST_LIBC_UNSTABLE_FREEBSD_VERSION") {
+        let vers = version.parse().unwrap();
+        println!("cargo:warning=setting FreeBSD version to {vers}");
+        vers
+    } else if libc_ci {
         which_freebsd().unwrap_or(11)
     } else if rustc_dep_of_std {
         12
     } else {
         11
     };
+
     match which_freebsd {
         x if x < 10 => panic!("FreeBSD older than 10 is not supported"),
         10 => set_cfg("freebsd10"),

ci/style.rs

@@ -115,7 +115,7 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
             }
         }
         if line.contains("#[derive(") && (line.contains("Copy") || line.contains("Clone")) {
-            err.error(path, i, "impl ::Copy and ::Clone manually");
+            err.error(path, i, "impl Copy and Clone manually");
         }
         if line.contains("impl") {
             in_impl = true;

ci/verify-build.sh

@@ -28,6 +28,7 @@ if [ "$TOOLCHAIN" = "nightly" ] ; then
     rustup component add rust-src
 fi
 
+# Run the tests for a specific target
 test_target() {
     target="${1}"
     no_dist="${2:-0}"
@@ -68,8 +69,31 @@ test_target() {
     # Test again without default features, i.e. without "std"
     $cmd --no-default-features
     $cmd --no-default-features --features extra_traits
+
+    # For tier 2 freebsd targets, check with the different versions we support
+    # if on nightly or stable
+    case "$rust-$target" in
+        stable-x86_64-*freebsd*) do_freebsd_checks=1 ;;
+        nightly-i686*freebsd*) do_freebsd_checks=1 ;;
+    esac
+    
+    if [ -n "${do_freebsd_checks:-}" ]; then
+        for version in $freebsd_versions; do
+            export RUST_LIBC_UNSTABLE_FREEBSD_VERSION="$version"
+            $cmd
+            $cmd --no-default-features
+        done
+    fi
 }
 
+freebsd_versions="\
+11 \
+12 \
+13 \
+14 \
+15 \
+"
+
 rust_linux_targets="\
 aarch64-linux-android \
 aarch64-unknown-linux-gnu \
@@ -244,21 +268,19 @@ for target in $targets; do
     if echo "$target" | grep -q "$filter"; then
         if [ "$os" = "windows" ]; then
             TARGET="$target" ./ci/install-rust.sh
-            test_target "$target"
-        else
-            # `wasm32-wasip1` was renamed from `wasm32-wasi`
-            if [ "$target" = "wasm32-wasip1" ] && [ "$supports_wasi_pn" = "0" ]; then
-                target="wasm32-wasi"
-            fi
+        fi
 
-            # `wasm32-wasip2` only exists in recent versions of Rust
-            if [ "$target" = "wasm32-wasip2" ] && [ "$supports_wasi_pn" = "0" ]; then
-                continue
-            fi
-            
-            test_target "$target"
+        # `wasm32-wasip1` was renamed from `wasm32-wasi`
+        if [ "$target" = "wasm32-wasip1" ] && [ "$supports_wasi_pn" = "0" ]; then
+            target="wasm32-wasi"
         fi
 
+        # `wasm32-wasip2` only exists in recent versions of Rust
+        if [ "$target" = "wasm32-wasip2" ] && [ "$supports_wasi_pn" = "0" ]; then
+            continue
+        fi
+            
+        test_target "$target"
         test_run=1
     fi
 done
@@ -267,11 +289,9 @@ for target in ${no_dist_targets:-}; do
     if echo "$target" | grep -q "$filter"; then
         if [ "$os" = "windows" ]; then
             TARGET="$target" ./ci/install-rust.sh
-            test_target "$target" 1
-        else
-            test_target "$target" 1
         fi
 
+        test_target "$target" 1
         test_run=1
     fi
 done

libc-test/build.rs

@@ -4734,9 +4734,16 @@ fn test_linux_like_apis(target: &str) {
 }
 
 fn which_freebsd() -> Option<i32> {
+    if let Ok(version) = env::var("RUST_LIBC_UNSTABLE_FREEBSD_VERSION") {
+        let vers = version.parse().unwrap();
+        println!("cargo:warning=setting FreeBSD version to {vers}");
+        return Some(vers);
+    }
+
     let output = std::process::Command::new("freebsd-version")
         .output()
         .ok()?;
+
     if !output.status.success() {
         return None;
     }

libc-test/semver/solarish.txt

@@ -17,6 +17,7 @@ LIO_WRITE
 PIPE_BUF
 SIGEV_PORT
 _POSIX_VDISABLE
+_ST_FSTYPSZ
 aio_cancel
 aio_error
 aio_fsync

src/fuchsia/aarch64.rs

@@ -1,4 +1,5 @@
-use crate::{c_int, c_long, c_uint, c_ulong, c_ulonglong, c_ushort, off_t, size_t};
+use crate::off_t;
+use crate::prelude::*;
 
 pub type c_char = u8;
 pub type __u64 = c_ulonglong;