Merge #956

956: Update no_atomic.rs r=taiki-e a=github-actions[bot]

Auto-generated by [create-pull-request][1]
[Please close and immediately reopen this pull request to run CI.][2]

[1]: https://github.com/peter-evans/create-pull-request
[2]: https://github.com/peter-evans/create-pull-request/blob/HEAD/docs/concepts-guidelines.md#workarounds-to-trigger-further-workflow-runs

Co-authored-by: Taiki Endo <[email protected]>

.cirrus.yml

@@ -1,5 +1,8 @@
+only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH == 'staging')
+auto_cancellation: $CIRRUS_BRANCH != 'master'
 env:
   CARGO_INCREMENTAL: '0'
+  CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
   CARGO_NET_RETRY: '10'
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: '1'
@@ -21,7 +24,7 @@ linux_task:
 
 macos_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
   matrix:
     - name: test (aarch64-apple-darwin)
       env:

.github/workflows/ci.yml

@@ -8,12 +8,12 @@ on:
   push:
     branches:
       - staging
-      - trying
   schedule:
     - cron: '0 1 * * *'
 
 env:
   CARGO_INCREMENTAL: 0
+  CARGO_NET_GIT_FETCH_WITH_CLI: true
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1

ci/no_atomic.sh

@@ -18,6 +18,7 @@ for target in $(rustc --print target-list); do
     res=$(jq <<<"${target_spec}" -r 'select(."atomic-cas" == false)')
     [[ -z "${res}" ]] || no_atomic_cas+=("${target}")
     max_atomic_width=$(jq <<<"${target_spec}" -r '."max-atomic-width"')
+    min_atomic_width=$(jq <<<"${target_spec}" -r '."min-atomic-width"')
     case "${max_atomic_width}" in
         # It is not clear exactly what `"max-atomic-width" == null` means, but they
         # actually seem to have the same max-atomic-width as the target-pointer-width.
@@ -35,6 +36,10 @@ for target in $(rustc --print target-list); do
         # There is no `"max-atomic-width" == 16` or `"max-atomic-width" == 8` targets.
         *) exit 1 ;;
     esac
+    case "${min_atomic_width}" in
+        8 | null)  ;;
+        *) no_atomic+=("${target}") ;;
+    esac
 done
 
 cat >"${file}" <<EOF

no_atomic.rs

@@ -5,6 +5,8 @@ const NO_ATOMIC_CAS: &[&str] = &[
     "armv4t-none-eabi",
     "armv5te-none-eabi",
     "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
     "msp430-none-elf",
     "riscv32i-unknown-none-elf",
     "riscv32im-unknown-none-elf",
@@ -73,6 +75,8 @@ const NO_ATOMIC_64: &[&str] = &[
 #[allow(dead_code)] // Only crossbeam-utils uses this.
 const NO_ATOMIC: &[&str] = &[
     "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
     "mipsel-sony-psx",
     "msp430-none-elf",
     "riscv32i-unknown-none-elf",