Merge remote-tracking branch 'upstream/main' into merge-upstream

Author: Arshia001

.cirrus.yml

@@ -3,7 +3,7 @@ task:
   freebsd_instance:
     image_family: freebsd-12-4
   setup_script:
-    - pkg install -y curl
+    - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
     - sh rustup.sh --default-toolchain nightly -y --profile=minimal
     - . $HOME/.cargo/env
@@ -15,9 +15,9 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-13
   freebsd_instance:
-    image_family: freebsd-13-1
+    image_family: freebsd-13-2
   setup_script:
-    - pkg install -y curl
+    - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
     - sh rustup.sh -y --default-toolchain nightly --profile=minimal
     - . $HOME/.cargo/env
@@ -29,7 +29,9 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-14
   freebsd_instance:
-    image_family: freebsd-14-0-snap
+    # FIXME: FreeBSD 14 CI fails due to pkg installation.
+    # Use 14 again once a new image is available on Cirrus CI.
+    image_family: freebsd-13-2
   setup_script:
     - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,10 @@ Thanks for considering submitting a PR!
 Here's a checklist for things that will be checked during review or continuous integration.
 
 - \[ ] Edit corresponding file(s) under `libc-test/semver` when you add/remove item(s)
+- \[ ] Your PR doesn't contain any *unstable* values like `*LAST` or `*MAX` (see [#3131](https://github.com/rust-lang/libc/issues/3131))
+- \[ ] If your PR increments version number, it must not contain any other changes
 - \[ ] `rustc ci/style.rs && ./style src`
-- \[ ] `cd libc-test && cargo test` (This might fail on your env due to environment difference between your env and CI. Ignore failures if you are not sure.)
-- \[ ] Your PR that bumps up the crate version doesn't contain any other changes
+- \[ ] `cd libc-test && cargo test`
+  - (this might fail on your env due to environment difference between your env and CI. Ignore failures if you are not sure)
 
 Delete this line and everything above before opening your PR.

.github/workflows/bors.yml

@@ -23,7 +23,7 @@ jobs:
           x86_64-unknown-linux-gnu,
         ]
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -46,7 +46,7 @@ jobs:
           x86_64-apple-darwin,
         ]
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -81,7 +81,7 @@ jobs:
           #    ARCH: i686
           - target: i686-pc-windows-msvc
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -103,7 +103,7 @@ jobs:
     name: Style check
     runs-on: ubuntu-22.04
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -163,7 +163,7 @@ jobs:
           # x86_64-unknown-redox,
         ]
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -191,7 +191,7 @@ jobs:
           armv7-unknown-linux-uclibceabihf
         ]
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -210,7 +210,7 @@ jobs:
     needs: [docker_linux_tier1, style_check]
     runs-on: ubuntu-22.04
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -244,7 +244,7 @@ jobs:
           1.30.0,
         ]
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
@@ -259,36 +259,32 @@ jobs:
 
     name: Build Channels macOS
     needs: macos
-    # FIXME: Use macOS 11 for now as CI failed with a linker error on macOS 12 image:
-    # ld: in /.../x86_64-apple-darwin/lib/libstd-a4729905.rlib(rust.metadata.bin),
-    # archive member 'rust.metadata.bin' with length 2958149 is not mach-o or llvm bitcode file '/.../x86_64-apple-darwin/lib/libstd-a4729905.rlib'
-    # Possibly related: https://github.com/actions/runner-images/issues/6350
-    runs-on: macos-11
     env:
       OS: macos
     strategy:
       fail-fast: true
       max-parallel: 4
       matrix:
-        toolchain: [
-          stable,
-          beta,
-          nightly,
-          1.13.0,
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-        ]
+        target:
+          - { toolchain: stable, os: macos-12 }
+          - { toolchain: beta, os: macos-12 }
+          - { toolchain: nightly, os: macos-12 }
+          # Use macOS 11 for older toolchains as newer Xcode donesn't work well.
+          - { toolchain: 1.13.0, os: macos-11 }
+          - { toolchain: 1.19.0, os: macos-11 }
+          - { toolchain: 1.24.0, os: macos-11 }
+          - { toolchain: 1.25.0, os: macos-11 }
+          - { toolchain: 1.30.0, os: macos-11 }
+    runs-on: ${{ matrix.target.os }}
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
       - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
+        run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
 
   build_channels_windows:
     permissions:
@@ -314,34 +310,25 @@ jobs:
         run: rustup self update
         shell: bash
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} WIN_TARGET=${{ matrix.target }} sh ./ci/build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
         shell: bash
 
-  semver_linux:
-    if: ${{ false }} # This is currently broken
-    name: Semver Linux
-    runs-on: ubuntu-22.04
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Rust toolchain
-        # Should update the semverver revision in semver.sh if we touch nightly ver.
-        run: TOOLCHAIN=nightly-2022-05-23 sh ./ci/install-rust.sh
-      - name: Check breaking changes
-        run: sh ci/semver.sh linux
+  check_cfg:
+    permissions:
+      actions: write # to cancel workflows (rust-lang/simpleinfra/github-actions/cancel-outdated-builds)
+      contents: read # to fetch code (actions/checkout)
 
-  semver_macos:
-    if: ${{ false }} # This is currently broken
-    name: Semver macOS
-    runs-on: macos-12
-    continue-on-error: true
+    name: "Check #[cfg]s"
+    runs-on: ubuntu-22.04
     steps:
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
+        with:
+          github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
       - name: Setup Rust toolchain
-        # Pin nightly version to make semverver compilable.
-        run: TOOLCHAIN=nightly-2022-05-23 sh ./ci/install-rust.sh
-      - name: Check breaking changes
-        run: sh ci/semver.sh macos
+        run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
+      - name: Build with check-cfg
+        run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg=features,names,values,output
 
   docs:
     permissions:
@@ -352,7 +339,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: docker_linux_tier2
     steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3

.github/workflows/docs.yml

@@ -3,7 +3,7 @@ name: Upload documentation to GitHub Pages
 on:
   push:
     branches:
-      - master
+      - main
 
 # Sets permissions of `GITHUB_TOKEN` to allow deployment to GitHub Pages
 permissions:
@@ -25,11 +25,13 @@ jobs:
       - name: Generate documentation
         run: LIBC_CI=1 sh ci/dox.sh
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v3
+      - name: Fix permissions
+        run: rm -f ./target/doc/.lock
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           path: 'target/doc'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v2

.github/workflows/main.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read # to fetch code (actions/checkout)

Cargo.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/rust-lang/libc"
 homepage = "https://github.com/rust-lang/libc"
 documentation = "https://docs.rs/libc/"
-keywords = ["libc", "ffi", "bindings", "operating", "system" ]
+keywords = ["libc", "ffi", "bindings", "operating", "system"]
 categories = ["external-ffi-bindings", "no-std", "os"]
 build = "build.rs"
 exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml"]
@@ -17,6 +17,115 @@ Raw FFI bindings to platform libraries like libc.
 
 [package.metadata.docs.rs]
 features = ["const-extern-fn", "extra_traits"]
+default-target = "x86_64-unknown-linux-gnu"
+targets = [
+    "aarch64-apple-ios",
+    "aarch64-linux-android",
+    "aarch64-pc-windows-msvc",
+    "aarch64-unknown-freebsd",
+    "aarch64-unknown-fuchsia",
+    "aarch64-unknown-hermit",
+    "aarch64-unknown-linux-gnu",
+    "aarch64-unknown-linux-musl",
+    "aarch64-unknown-netbsd",
+    "aarch64-unknown-openbsd",
+    "aarch64-wrs-vxworks",
+    "arm-linux-androideabi",
+    "arm-unknown-linux-gnueabi",
+    "arm-unknown-linux-gnueabihf",
+    "arm-unknown-linux-musleabi",
+    "arm-unknown-linux-musleabihf",
+    "armebv7r-none-eabi",
+    "armebv7r-none-eabihf",
+    "armv5te-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-musleabi",
+    "armv7-linux-androideabi",
+    "armv7-unknown-linux-gnueabihf",
+    "armv7-unknown-linux-musleabihf",
+    "armv7-wrs-vxworks-eabihf",
+    "armv7r-none-eabi",
+    "armv7r-none-eabihf",
+    "hexagon-unknown-linux-musl",
+    "i586-pc-windows-msvc",
+    "i586-unknown-linux-gnu",
+    "i586-unknown-linux-musl",
+    "i686-linux-android",
+    "i686-pc-windows-gnu",
+    "i686-pc-windows-msvc",
+    "i686-pc-windows-msvc",
+    "i686-unknown-freebsd",
+    "i686-unknown-haiku",
+    "i686-unknown-linux-gnu",
+    "i686-unknown-linux-musl",
+    "i686-unknown-netbsd",
+    "i686-unknown-openbsd",
+    "i686-wrs-vxworks",
+    "mips-unknown-linux-gnu",
+    "mips-unknown-linux-musl",
+    "mips64-unknown-linux-gnuabi64",
+    "mips64-unknown-linux-muslabi64",
+    "mips64el-unknown-linux-gnuabi64",
+    "mips64el-unknown-linux-muslabi64",
+    "mipsel-sony-psp",
+    "mipsel-unknown-linux-gnu",
+    "mipsel-unknown-linux-musl",
+    "nvptx64-nvidia-cuda",
+    "powerpc-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnuspe",
+    "powerpc-unknown-netbsd",
+    "powerpc-wrs-vxworks",
+    "powerpc-wrs-vxworks-spe",
+    "powerpc64-unknown-freebsd",
+    "powerpc64-unknown-linux-gnu",
+    "powerpc64-wrs-vxworks",
+    "powerpc64le-unknown-linux-gnu",
+    "riscv32gc-unknown-linux-gnu",
+    "riscv32i-unknown-none-elf",
+    "riscv32imac-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "riscv64gc-unknown-freebsd",
+    "riscv64gc-unknown-linux-gnu",
+    "riscv64gc-unknown-linux-musl",
+    "riscv64gc-unknown-none-elf",
+    "riscv64imac-unknown-none-elf",
+    "s390x-unknown-linux-gnu",
+    "s390x-unknown-linux-musl",
+    "sparc-unknown-linux-gnu",
+    "sparc64-unknown-linux-gnu",
+    "sparc64-unknown-netbsd",
+    "sparcv9-sun-solaris",
+    "thumbv6m-none-eabi",
+    "thumbv7em-none-eabi",
+    "thumbv7em-none-eabihf",
+    "thumbv7m-none-eabi",
+    "thumbv7neon-linux-androideabi",
+    "thumbv7neon-unknown-linux-gnueabihf",
+    "wasm32-unknown-emscripten",
+    "wasm32-unknown-unknown",
+    "wasm32-wasi",
+    "x86_64-apple-darwin",
+    "x86_64-apple-ios",
+    "x86_64-fortanix-unknown-sgx",
+    "x86_64-linux-android",
+    "x86_64-pc-solaris",
+    "x86_64-pc-windows-gnu",
+    "x86_64-pc-windows-msvc",
+    "x86_64-unknown-dragonfly",
+    "x86_64-unknown-freebsd",
+    "x86_64-unknown-fuchsia",
+    "x86_64-unknown-haiku",
+    "x86_64-unknown-hermit",
+    "x86_64-unknown-illumos",
+    "x86_64-unknown-l4re-uclibc",
+    "x86_64-unknown-linux-gnu",
+    "x86_64-unknown-linux-gnux32",
+    "x86_64-unknown-linux-musl",
+    "x86_64-unknown-netbsd",
+    "x86_64-unknown-openbsd",
+    "x86_64-unknown-redox",
+    "x86_64-wrs-vxworks"
+]
+cargo-args = ["-Zbuild-std=core"]
 
 [dependencies]
 rustc-std-workspace-core = { version = "1.0.0", optional = true }
@@ -29,7 +138,7 @@ rustc-dep-of-std = ['align', 'rustc-std-workspace-core']
 extra_traits = []
 const-extern-fn = []
 # use_std is deprecated, use `std` instead
-use_std = [ 'std' ]
+use_std = ['std']
 
 [workspace]
 members = ["libc-test"]