Bug 1849874 - Update from packed_simd_2 to packed_simd. r=supply-chain-reviewers,glandium

Differential Revision: https://phabricator.services.mozilla.com/D186716

.cargo/config.in

@@ -55,9 +55,9 @@ git = "https://github.com/hsivonen/chardetng_c"
 rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/hsivonen/packed_simd?rev=412f9a0aa556611de021bde89dee8fefe6e0fbbd"]
+[source."git+https://github.com/hsivonen/packed_simd?rev=e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"]
 git = "https://github.com/hsivonen/packed_simd"
-rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd"
+rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01"]

Cargo.lock

@@ -1484,12 +1484,12 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if 1.0.0",
- "packed_simd_2",
+ "packed_simd",
 ]
 
 [[package]]
@@ -4118,11 +4118,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "packed_simd_2"
-version = "0.3.8"
-source = "git+https://github.com/hsivonen/packed_simd?rev=412f9a0aa556611de021bde89dee8fefe6e0fbbd#412f9a0aa556611de021bde89dee8fefe6e0fbbd"
+name = "packed_simd"
+version = "0.3.9"
+source = "git+https://github.com/hsivonen/packed_simd?rev=e588ceb568878e1a3156ea9ce551d5b63ef0cdc4#e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"
 dependencies = [
  "cfg-if 1.0.0",
+ "num-traits",
 ]
 
 [[package]]

Cargo.toml

@@ -190,7 +190,7 @@ cose = { git = "https://github.com/franziskuskiefer/cose-rust", rev = "43c22248d
 firefox-on-glean = { path = "toolkit/components/glean/api" }
 icu_testdata = { path = "intl/icu_testdata" }
 libudev-sys = { path = "dom/webauthn/libudev-sys" }
-packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd" }
+packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4" }
 midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" }
 # Avoid the dependency on chrono
 minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "a15bd5cab6a3de251c0c23264be14b977c0af09c" }

config/makefiles/rust.mk

@@ -249,7 +249,7 @@ endif
 ifndef RUSTC_BOOTSTRAP
 RUSTC_BOOTSTRAP := mozglue_static,qcms
 ifdef MOZ_RUST_SIMD
-RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd_2
+RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd
 endif
 export RUSTC_BOOTSTRAP
 endif

supply-chain/audits.toml

@@ -161,6 +161,14 @@ start = "2019-03-04"
 end = "2024-05-05"
 notes = "Lina developed this crate as Mozilla staff."
 
+[[wildcard-audits.encoding_rs]]
+who = "Henri Sivonen <hsivonen@hsivonen.fi>"
+criteria = "safe-to-deploy"
+user-id = 4484 # Henri Sivonen (hsivonen)
+start = "2019-02-26"
+end = "2024-08-28"
+notes = "I, Henri Sivonen, wrote encoding_rs for Gecko and have reviewed contributions by others. There are two caveats to the certification: 1) The crate does things that are documented to be UB but that do not appear to actually be UB due to integer types differing from the general rule; https://github.com/hsivonen/encoding_rs/issues/79 . 2) It would be prudent to re-review the code that reinterprets buffers of integers as SIMD vectors; see https://github.com/hsivonen/encoding_rs/issues/87 ."
+
 [[wildcard-audits.etagere]]
 who = "Nicolas Silva <nical@fastmail.com>"
 criteria = "safe-to-deploy"
@@ -2432,6 +2440,18 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"
 delta = "6.3.0 -> 6.4.1"
 
+[[audits.packed_simd]]
+who = "Henri Sivonen <hsivonen@hsivonen.fi>"
+criteria = "safe-to-deploy"
+delta = "0.3.8 -> 0.3.9"
+notes = "The update from 0.3.8 to 0.3.9 makes mechanical changes to accommodate renaming, compiler updates, and CI service updates."
+
+[[audits.packed_simd]]
+who = "Henri Sivonen <hsivonen@hsivonen.fi>"
+criteria = "safe-to-deploy"
+delta = "0.3.9 -> 0.3.9@git:e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"
+notes = "The patch on top of crates.io version 0.3.9 merely deletes code for a feature that Firefox does not use."
+
 [[audits.packed_simd_2]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"

supply-chain/config.toml

@@ -155,7 +155,7 @@ audit-as-crates-io = false
 audit-as-crates-io = true
 notes = "wgpu-core pins this crate."
 
-[policy.packed_simd_2]
+[policy.packed_simd]
 audit-as-crates-io = true
 notes = "Based on upstream, see bug 1719674."
 
@@ -655,8 +655,8 @@ criteria = "safe-to-deploy"
 version = "0.4.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.packed_simd_2]]
-version = "0.3.7"
+[[exemptions.packed_simd]]
+version = "0.3.8"
 criteria = "safe-to-deploy"
 
 [[exemptions.phf]]

supply-chain/imports.lock

@@ -176,6 +176,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.encoding_rs]]
+version = "0.8.33"
+when = "2023-08-23"
+user-id = 4484
+user-login = "hsivonen"
+user-name = "Henri Sivonen"
+
 [[publisher.etagere]]
 version = "0.2.7"
 when = "2022-05-04"

third_party/rust/encoding_rs/Cargo.toml

@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
 description = "A Gecko-oriented implementation of the Encoding Standard"
 homepage = "https://docs.rs/encoding_rs/"
@@ -40,9 +40,8 @@ lto = true
 version = "1.0"
 
 [dependencies.packed_simd]
-version = "0.3.4"
+version = "0.3.9"
 optional = true
-package = "packed_simd_2"
 
 [dependencies.serde]
 version = "1.0"

third_party/rust/encoding_rs/README.md

@@ -167,7 +167,7 @@ There are currently these optional cargo features:
 
 ### `simd-accel`
 
-Enables SIMD acceleration using the nightly-dependent `packed_simd_2` crate.
+Enables SIMD acceleration using the nightly-dependent `packed_simd` crate.
 
 This is an opt-in feature, because enabling this feature _opts out_ of Rust's
 guarantees of future compilers compiling old code (aka. "stability story").
@@ -188,7 +188,7 @@ feature.
 _Note!_ If you are compiling for a target that does not have 128-bit SIMD
 enabled as part of the target definition and you are enabling 128-bit SIMD
 using `-C target_feature`, you need to enable the `core_arch` Cargo feature
-for `packed_simd_2` to compile a crates.io snapshot of `core_arch` instead of
+for `packed_simd` to compile a crates.io snapshot of `core_arch` instead of
 using the standard-library copy of `core::arch`, because the `core::arch`
 module of the pre-compiled standard library has been compiled with the
 assumption that the CPU doesn't have 128-bit SIMD. At present this applies
@@ -450,6 +450,10 @@ To regenerate the generated code:
 
 ## Release Notes
 
+### 0.8.33
+
+* Use `packed_simd` instead of `packed_simd_2` again now that updates are back under the `packed_simd` name. Only affects the `simd-accel` optional nightly feature.
+
 ### 0.8.32
 
 * Removed `build.rs`. (This removal should resolve false positives reported by some antivirus products. This may break some build configurations that have opted out of Rust's guarantees against future build breakage.)

third_party/rust/packed_simd/.github/workflows/benchmarks.yml

@@ -0,0 +1,31 @@
+name: benchmarks
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  x86_64-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    with:
+      target: x86_64-unknown-linux-gnu
+      setup_script: ci/setup_benchmarks.sh
+      script: ci/benchmark.sh
+      norun: 1
+      verify: 1
+      # FIXME: figure out how to add downloaded ispc to PATH
+      # features: ispc
+  x86_64-apple-darwin:
+    uses: ./.github/workflows/run-ci-script.yml
+    with:
+      target: x86_64-apple-darwin
+      runner: macos-latest
+      setup_script: ci/setup_benchmarks.sh
+      script: ci/benchmark.sh
+      norun: 1
+      verify: 1
+      # FIXME: figure out how to add downloaded ispc to PATH
+      # features: ispc

third_party/rust/packed_simd/.github/workflows/ci.yml

@@ -0,0 +1,218 @@
+name: ci
+
+# trigger for all PRs and changes to master
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  rustfmt:
+    uses: ./.github/workflows/run-ci-script.yml
+    with:
+      script: ci/all.sh check_fmt || true
+  x86_64-unknown-linux-android:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: x86_64-linux-android
+  armv7-linux-androideabi:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: armv7-linux-androideabi
+  aarch64-unknown-linux-android-NEON:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: aarch64-linux-android
+      rustflags: -Ctarget-feature=+neon
+  thumbv7neon-linux-androideabi:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: thumbv7neon-linux-androideabi
+  i586-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i586-unknown-linux-gnu
+      rustflags: -Crelocation-model=static
+  i586-unknown-linux-gnu-SSE:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i586-unknown-linux-gnu
+      rustflags: -Crelocation-model=static -Ctarget-feature=+sse
+  i586-unknown-linux-gnu-SSE2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i586-unknown-linux-gnu
+      rustflags: -Crelocation-model=static -Ctarget-feature=+sse2
+  i686-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i686-unknown-linux-gnu
+      rustflags: -Crelocation-model=static
+  i686-unknown-linux-gnu-SSE4_2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i686-unknown-linux-gnu
+      rustflags: -Crelocation-model=static -Ctarget-feature=+sse4.2
+  i686-unknown-linux-gnu-AVX2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: i686-unknown-linux-gnu
+      rustflags: -Crelocation-model=static -Ctarget-feature=+avx2
+  x86_64-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: x86_64-unknown-linux-gnu
+  x86_64-unknown-linux-gnu-SSE4_2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: x86_64-unknown-linux-gnu
+      rustflags: -Ctarget-feature=+sse4.2
+  x86_64-unknown-linux-gnu-AVX2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: x86_64-unknown-linux-gnu
+      rustflags: -Ctarget-feature=+avx2
+  arm-unknown-linux-gnueabihf:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: arm-unknown-linux-gnueabihf
+  armv7-unknown-linux-gnueabihf:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: armv7-unknown-linux-gnueabihf
+  armv7-unknown-linux-gnueabihf-NEON:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: armv7-unknown-linux-gnueabihf
+      rustflags: -Ctarget-feature=+neon
+  thumbv7neon-unknown-linux-gnueabihf:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: thumbv7neon-unknown-linux-gnueabihf
+  aarch64-unknown-linux-gnu-NEON:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: aarch64-unknown-linux-gnu
+      rustflags: -Ctarget-feature=+neon
+  powerpc-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: powerpc-unknown-linux-gnu
+  powerpc64-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: powerpc64-unknown-linux-gnu
+  powerpc64le-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: powerpc64le-unknown-linux-gnu
+  powerpc64le-unknown-linux-gnu-ALTIVEC:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: powerpc64le-unknown-linux-gnu
+      rustflags: -Ctarget-feature=+altivec
+  powerpc64le-unknown-linux-gnu-VSX:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      target: powerpc64le-unknown-linux-gnu
+      rustflags: -Ctarget-feature=+vsx
+  s390x-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: s390x-unknown-linux-gnu
+  sparc64-unknown-linux-gnu:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: sparc64-unknown-linux-gnu
+  wasm32-unknown-unknown:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: false
+    with:
+      target: wasm32-unknown-unknown
+  x86_64-apple-darwin-SSE4_2:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      runner: macos-latest
+      script: ci/run.sh
+      target: x86_64-apple-darwin
+      rustflags: -Ctarget-feature=+sse4.2
+  x86_64-apple-darwin-AVX:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      runner: macos-latest
+      script: ci/run.sh
+      target: x86_64-apple-darwin
+      rustflags: -Ctarget-feature=+avx
+  x86_64-apple-ios:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      runner: macos-latest
+      script: ci/run.sh
+      target: x86_64-apple-ios
+  aarch64-apple-ios:
+    uses: ./.github/workflows/run-ci-script.yml
+    strategy:
+      fail-fast: true
+    with:
+      runner: macos-latest
+      script: ci/run.sh
+      target: aarch64-apple-ios
+      rustflags: -Ctarget-feature=+neon

third_party/rust/packed_simd/.github/workflows/docs.yml

@@ -0,0 +1,13 @@
+name: docs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  docs:
+    uses: ./.github/workflows/run-ci-script.yml
+    with:
+      setup_script: cargo install mdbook
+      script: ci/dox.sh

third_party/rust/packed_simd/.github/workflows/run-ci-script.yml

@@ -0,0 +1,86 @@
+name: run-ci-script
+
+on:
+  workflow_call:
+    inputs:
+      runner:
+        required: false
+        type: string
+        default: ubuntu-latest
+      target:
+        required: false
+        type: string
+        default: ''
+      rustflags:
+        required: false
+        type: string
+        default: ''
+      script:
+        required: false
+        type: string
+        default: ci/run-docker.sh
+      setup_script:
+        required: false
+        type: string
+      norun:
+        required: false
+        type: string
+        default: ''
+      verify:
+        required: false
+        type: string
+        default: ''
+      features:
+        required: false
+        type: string
+        default: ''
+
+jobs:
+  run-ci-script:
+    runs-on: ${{ inputs.runner }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Init Rustup Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.rustup/toolchains
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/rust-toolchain') }}
+      - name: Install Toolchain
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          # FIXME: change to nightly once https://github.com/rust-lang/packed_simd/pull/350 is merged
+          # needs to be kept in sync with the toolchain files
+          targets: ${{ inputs.target }}
+          components: rustfmt
+      - name: Generate Lockfile
+        run: cargo generate-lockfile
+      - name: Init Cargo Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Setup
+        if: ${{ inputs.setup_script != '' }}
+        run: ${{ inputs.setup_script }}
+        env:
+          TARGET: ${{ inputs.target }}
+          RUSTFLAGS: ${{ inputs.rustflags }}
+          NORUN: ${{ inputs.norun }}
+          VERIFY: ${{ inputs.verify }}
+          FEATURES: ${{ inputs.features }}
+      - name: Run CI Script
+        timeout-minutes: 30
+        run: ${{ inputs.script }}
+        env:
+          TARGET: ${{ inputs.target }}
+          RUSTFLAGS: ${{ inputs.rustflags }}
+          NORUN: ${{ inputs.norun }}
+          VERIFY: ${{ inputs.verify }}
+          FEATURES: ${{ inputs.features }}

third_party/rust/packed_simd/Cargo.toml

@@ -11,8 +11,8 @@
 
 [package]
 edition = "2018"
-name = "packed_simd_2"
-version = "0.3.8"
+name = "packed_simd"
+version = "0.3.9"
 build = "build.rs"
 description = "Portable Packed SIMD vectors"
 homepage = "https://github.com/rust-lang/packed_simd"
@@ -32,6 +32,13 @@ categories = [
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/packed_simd"
 
+[package.metadata.docs.rs]
+features = ["into_bits"]
+rustdoc-args = [
+    "--cfg",
+    "doc_cfg",
+]
+
 [dependencies]
 cfg-if = "1.0.0"
 
@@ -39,8 +46,12 @@ cfg-if = "1.0.0"
 version = "0.1.5"
 optional = true
 
+[dependencies.num-traits]
+version = "0.2.14"
+default-features = false
+
 [dev-dependencies]
-paste = "^0.1.3"
+paste = "^1"
 
 [dev-dependencies.arrayvec]
 version = "^0.5"
@@ -56,14 +67,8 @@ version = "0.1.2"
 optional = true
 
 [target.wasm32-unknown-unknown.dev-dependencies]
-wasm-bindgen = "=0.2.73"
-wasm-bindgen-test = "=0.3.23"
-
-[badges.appveyor]
-repository = "rust-lang/packed_simd"
-
-[badges.codecov]
-repository = "rust-lang/packed_simd"
+wasm-bindgen = "=0.2.87"
+wasm-bindgen-test = "=0.3.37"
 
 [badges.is-it-maintained-issue-resolution]
 repository = "rust-lang/packed_simd"
@@ -73,6 +78,3 @@ repository = "rust-lang/packed_simd"
 
 [badges.maintenance]
 status = "experimental"
-
-[badges.travis-ci]
-repository = "rust-lang/packed_simd"

third_party/rust/packed_simd/README.md

@@ -1,24 +1,11 @@
-# The Crates.io Version Can No Longer Be Updated!
-
-The original maintainer is out of contact, and the new maintainers (the Portable SIMD Project Group) do not have the appropriate crates.io permissions to issue updates.
-
-We are aware that the version available on crates.io is currently broken, and will not build.
-
-If you need to continue to use the crate, we have published a "next version" under an alternative name.
-
-Adjust your `[dependencies]` section of `Cargo.toml` to be the following:
-```toml
-packed_simd = { version = "0.3.8", package = "packed_simd_2" }
-```
-
 # `Simd<[T; N]>`
 
 ## Implementation of [Rust RFC #2366: `std::simd`][rfc2366]
 
-[![Travis-CI Status]][travis] <!-- [![Appveyor Status]][appveyor] --> [![Latest Version]][crates.io] [![docs]][master_docs]
+[![Latest Version]][crates.io] [![docs]][master_docs]
 
 **WARNING**: this crate only supports the most recent nightly Rust toolchain
-and will be superseded by [stdsimd](https://github.com/rust-lang/stdsimd).
+and will be superseded by [`#![feature(portable_simd)]`](https://github.com/rust-lang/portable-simd).
 
 ## Documentation
 
@@ -84,30 +71,25 @@ whether the test suite passes for a given target.
 | `i586-unknown-linux-gnu`              | ✓         | ✗       |
 | `i686-unknown-linux-gnu`              | ✓         | ✗       |
 | `x86_64-unknown-linux-gnu`            | ✓         | ✓       |
-| `arm-unknown-linux-gnueabi`           | ✗         | ✗       |
 | `arm-unknown-linux-gnueabihf`         | ✓         | ✓       |
 | `armv7-unknown-linux-gnueabi`         | ✓         | ✓       |
 | `aarch64-unknown-linux-gnu`           | ✓         | ✓       |
-| `mips-unknown-linux-gnu`              | ✓         | ✗       |
-| `mipsel-unknown-linux-musl`           | ✓         | ✗       |
-| `mips64-unknown-linux-gnuabi64`       | ✓         | ✗       |
-| `mips64el-unknown-linux-gnuabi64`     | ✓         | ✗       |
-| `powerpc-unknown-linux-gnu`           | ✗         | ✗       |
-| `powerpc64-unknown-linux-gnu`         | ✗         | ✗       |
+| `powerpc-unknown-linux-gnu`           | ✓         | ✗       |
+| `powerpc64-unknown-linux-gnu`         | ✓         | ✗       |
 | `powerpc64le-unknown-linux-gnu`       | ✓         | ✓       |
-| `s390x-unknown-linux-gnu`             | ✗         | ✗       |
+| `s390x-unknown-linux-gnu`             | ✓         | ✗       |
 | `sparc64-unknown-linux-gnu`           | ✓         | ✗       |
 | `thumbv7neon-unknown-linux-gnueabihf` | ✓         | ✓       |
 | **MacOSX**                            | **build** | **run** |
 | `x86_64-apple-darwin`                 | ✓         | ✓       |
 | **Android**                           | **build** | **run** |
 | `x86_64-linux-android`                | ✓         | ✓       |
-| `arm-linux-androideabi`               | ✓         | ✓       |
-| `aarch64-linux-android`               | ✓         | ✓       |
-| `thumbv7neon-linux-androideabi`       | ✗         | ✗       |
+| `armv7-linux-androideabi`             | ✓         | ✗       |
+| `aarch64-linux-android`               | ✓         | ✗       |
+| `thumbv7neon-linux-androideabi`       | ✓         | ✗       |
 | **iOS**                               | **build** | **run** |
-| `x86_64-apple-ios`                    | ✓         | ✗       |
-| `aarch64-apple-ios`                   | ✓         | ✗       |
+| `x86_64-apple-ios`                    | ✗         | ✗       |
+| `aarch64-apple-ios`                   | ✗         | ✗       |
 
 
 ## Machine code verification
@@ -146,11 +128,11 @@ dual licensed as above, without any additional terms or conditions.
 [Travis-CI Status]: https://travis-ci.com/rust-lang/packed_simd.svg?branch=master
 [appveyor]: https://ci.appveyor.com/project/gnzlbg/packed-simd
 [Appveyor Status]: https://ci.appveyor.com/api/projects/status/hd7v9dvr442hgdix?svg=true
-[Latest Version]: https://img.shields.io/crates/v/packed_simd_2.svg
-[crates.io]: https://crates.io/crates/packed_simd_2
-[docs]: https://docs.rs/packed_simd_2/badge.svg
-[docs.rs]: https://docs.rs/packed_simd_2
-[master_docs]: https://rust-lang-nursery.github.io/packed_simd/packed_simd_2/
+[Latest Version]: https://img.shields.io/crates/v/packed_simd.svg
+[crates.io]: https://crates.io/crates/packed_simd
+[docs]: https://docs.rs/packed_simd/badge.svg
+[docs.rs]: https://docs.rs/packed_simd
+[master_docs]: https://rust-lang-nursery.github.io/packed_simd/packed_simd/
 [perf_guide]: https://rust-lang-nursery.github.io/packed_simd/perf-guide/
 [rfc2366]: https://github.com/rust-lang/rfcs/pull/2366
 [ISPC]: https://ispc.github.io/

third_party/rust/packed_simd/ci/android-install-ndk.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+# Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+set -ex
+
+ANDROID_NDK_URL=https://dl.google.com/android/repository
+ANDROID_NDK_ARCHIVE=android-ndk-r25b-linux.zip
+
+curl -fO "$ANDROID_NDK_URL/$ANDROID_NDK_ARCHIVE"
+unzip -q $ANDROID_NDK_ARCHIVE
+rm $ANDROID_NDK_ARCHIVE
+mv android-ndk-* ndk
+rm -rf android-ndk-*

third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     gcc \

third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

third_party/rust/packed_simd/ci/docker/s390x-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -17,4 +17,4 @@ ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
     CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /usr/s390x-linux-gnu" \
     CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
     CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++ \
-    OBJDUMP=s390x-linux-gnu-objdump
+    OBJDUMP=s390x-linux-gnu-objdump

third_party/rust/packed_simd/ci/docker/sparc64-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \
@@ -15,4 +15,4 @@ COPY test-runner-linux /
 ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
     CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-linux sparc64" \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
-    PATH=$PATH:/rust/bin
+    PATH=$PATH:/rust/bin

third_party/rust/packed_simd/ci/docker/wasm32-unknown-unknown/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
   ca-certificates \
@@ -8,7 +8,8 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   git \
   libc6-dev \
   make \
-  python \
+  ninja-build \
+  python-is-python3 \
   xz-utils
 
 # Install `wasm2wat`
@@ -17,10 +18,10 @@ RUN make -C wabt -j$(nproc)
 ENV PATH=$PATH:/wabt/bin
 
 # Install `wasm-bindgen-test-runner`
-RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.73/wasm-bindgen-0.2.73-x86_64-unknown-linux-musl.tar.gz \
+RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.87/wasm-bindgen-0.2.87-x86_64-unknown-linux-musl.tar.gz \
   | tar xzf -
 # Keep in sync with the version on Cargo.toml.
-ENV PATH=$PATH:/wasm-bindgen-0.2.73-x86_64-unknown-linux-musl
+ENV PATH=$PATH:/wasm-bindgen-0.2.87-x86_64-unknown-linux-musl
 ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
 
 # Install `node`

third_party/rust/packed_simd/ci/docker/x86_64-linux-android/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -14,16 +14,18 @@ RUN apt-get update && \
 WORKDIR /android/
 ENV ANDROID_ARCH=x86_64
 COPY android-install-ndk.sh /android/
-RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
+RUN sh /android/android-install-ndk.sh
+
+ENV STDARCH_ASSERT_INSTR_LIMIT=30
 
 # We do not run x86_64-linux-android tests on an android emulator.
 # See ci/android-sysimage.sh for informations about how tests are run.
 COPY android-sysimage.sh /android/
 RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
 
-ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/bin \
-    CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
-    CC_x86_64_linux_android=x86_64-linux-android-gcc \
-    CXX_x86_64_linux_android=x86_64-linux-android-g++ \
-    OBJDUMP=x86_64-linux-android-objdump \
+ENV PATH=$PATH:/rust/bin:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
+    CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang \
+    CC_x86_64_linux_android=x86_64-linux-android21-clang \
+    CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
+    OBJDUMP=llvm-objdump \
     HOME=/tmp

third_party/rust/packed_simd/ci/run.sh

@@ -95,4 +95,5 @@ if [[ "${NOVERIFY}" != "1" ]]; then
     cargo_test --release --manifest-path=target/verify/Cargo.toml
 fi
 
-. ci/run_examples.sh
+# FIXME: Figure out which examples take too long to run and ignore or adjust those
+#. ci/run_examples.sh

third_party/rust/packed_simd/src/api/bit_manip.rs

@@ -34,7 +34,7 @@ macro_rules! impl_bit_manip {
 
         test_if! {
             $test_tt:
-            paste::item_with_macros! {
+            paste::item! {
                 #[allow(overflowing_literals)]
                 pub mod [<$id _bit_manip>] {
                     #![allow(const_item_mutation)]

third_party/rust/packed_simd/src/api/bitmask.rs

@@ -17,13 +17,10 @@ macro_rules! impl_bitmask {
         test_if! {
             $test_tt:
             paste::item! {
-                #[cfg(not(any(
+                #[cfg(not(
                     // FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/210
-                    all(target_arch = "mips", target_endian = "big"),
-                    all(target_arch = "mips64", target_endian = "big"),
-                    target_arch = "sparc64",
-                    target_arch = "s390x",
-                )))]
+                    target_endian = "big"
+                ))]
                 pub mod [<$id _bitmask>] {
                     use super::*;
                     #[cfg_attr(not(target_arch = "wasm32"), test)]