contrib-tek/firefox/simd039.patch

From: Henri Sivonen <hsivonen@hsivonen.fi>
Date: Mon, 28 Aug 2023 18:46:28 +0000
Subject: [PATCH] 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                              |   4 +-
 Cargo.lock                                    |  13 +-
 Cargo.toml                                    |   2 +-
 config/makefiles/rust.mk                      |   2 +-
 supply-chain/audits.toml                      |  20 ++
 supply-chain/config.toml                      |   6 +-
 supply-chain/imports.lock                     |   7 +
 .../rust/encoding_rs/.cargo-checksum.json     |   2 +-
 third_party/rust/encoding_rs/Cargo.toml       |   5 +-
 third_party/rust/encoding_rs/README.md        |   8 +-
 .../.appveyor.yml                             |   0
 .../rust/packed_simd/.cargo-checksum.json     |   1 +
 .../.github/workflows/benchmarks.yml          |  31 +++
 .../rust/packed_simd/.github/workflows/ci.yml | 218 ++++++++++++++++++
 .../packed_simd/.github/workflows/docs.yml    |  13 ++
 .../.github/workflows/run-ci-script.yml       |  86 +++++++
 .../.travis.yml                               |   0
 .../{packed_simd_2 => packed_simd}/Cargo.toml |  30 +--
 .../LICENSE-APACHE                            |   0
 .../LICENSE-MIT                               |   0
 .../{packed_simd_2 => packed_simd}/README.md  |  48 ++--
 .../{packed_simd_2 => packed_simd}/bors.toml  |   0
 .../{packed_simd_2 => packed_simd}/build.rs   |   0
 .../{packed_simd_2 => packed_simd}/ci/all.sh  |   0
 .../packed_simd/ci/android-install-ndk.sh     |  21 ++
 .../ci/android-install-sdk.sh                 |   0
 .../ci/android-sysimage.sh                    |   0
 .../ci/benchmark.sh                           |   0
 .../ci/deploy_and_run_on_ios_simulator.rs     |   0
 .../docker/aarch64-linux-android/Dockerfile   |   0
 .../aarch64-unknown-linux-gnu/Dockerfile      |   0
 .../arm-unknown-linux-gnueabi/Dockerfile      |   0
 .../arm-unknown-linux-gnueabihf/Dockerfile    |   0
 .../armv7-linux-androideabi}/Dockerfile       |   0
 .../armv7-unknown-linux-gnueabihf/Dockerfile  |   0
 .../docker/i586-unknown-linux-gnu/Dockerfile  |   0
 .../docker/i686-unknown-linux-gnu/Dockerfile  |   0
 .../docker/mips-unknown-linux-gnu/Dockerfile  |   0
 .../mips64-unknown-linux-gnuabi64/Dockerfile  |   0
 .../Dockerfile                                |   0
 .../mipsel-unknown-linux-musl/Dockerfile      |   0
 .../powerpc-unknown-linux-gnu/Dockerfile      |   2 +-
 .../powerpc64-unknown-linux-gnu/Dockerfile    |   2 +-
 .../powerpc64le-unknown-linux-gnu/Dockerfile  |   2 +-
 .../docker/s390x-unknown-linux-gnu/Dockerfile |   4 +-
 .../sparc64-unknown-linux-gnu/Dockerfile      |   4 +-
 .../thumbv7neon-linux-androideabi/Dockerfile  |   0
 .../Dockerfile                                |   0
 .../docker/wasm32-unknown-unknown/Dockerfile  |   9 +-
 .../ci/docker/x86_64-linux-android/Dockerfile |  16 +-
 .../Dockerfile                                |   0
 .../x86_64-unknown-linux-gnu/Dockerfile       |   0
 .../{packed_simd_2 => packed_simd}/ci/dox.sh  |   0
 .../ci/linux-s390x.sh                         |   0
 .../ci/linux-sparc64.sh                       |   0
 .../ci/lld-shim.rs                            |   0
 .../ci/max_line_width.sh                      |   0
 .../ci/run-docker.sh                          |   0
 .../{packed_simd_2 => packed_simd}/ci/run.sh  |   3 +-
 .../ci/run_examples.sh                        |   0
 .../ci/runtest-android.rs                     |   0
 .../ci/setup_benchmarks.sh                    |   0
 .../ci/test-runner-linux                      |   0
 .../contributing.md                           |   0
 .../perf-guide/.gitignore                     |   0
 .../perf-guide/book.toml                      |   0
 .../perf-guide/src/SUMMARY.md                 |   0
 .../perf-guide/src/ascii.css                  |   0
 .../perf-guide/src/bound_checks.md            |   0
 .../perf-guide/src/float-math/approx.md       |   0
 .../perf-guide/src/float-math/fma.md          |   0
 .../perf-guide/src/float-math/fp.md           |   0
 .../perf-guide/src/float-math/svml.md         |   0
 .../perf-guide/src/introduction.md            |   0
 .../perf-guide/src/prof/linux.md              |   0
 .../perf-guide/src/prof/mca.md                |   0
 .../perf-guide/src/prof/profiling.md          |   0
 .../src/target-feature/attribute.md           |   0
 .../perf-guide/src/target-feature/features.md |   0
 .../perf-guide/src/target-feature/inlining.md |   0
 .../perf-guide/src/target-feature/practice.md |   0
 .../perf-guide/src/target-feature/runtime.md  |   0
 .../src/target-feature/rustflags.md           |   0
 .../perf-guide/src/vert-hor-ops.md            |   0
 .../rustfmt.toml                              |   0
 .../{packed_simd_2 => packed_simd}/src/api.rs |   0
 .../src/api/bit_manip.rs                      |   2 +-
 .../src/api/bitmask.rs                        |   9 +-
 .../src/api/cast.rs                           |   0
 .../src/api/cast/macros.rs                    |   0
 .../src/api/cast/v128.rs                      |   0
 .../src/api/cast/v16.rs                       |   0
 .../src/api/cast/v256.rs                      |   0
 .../src/api/cast/v32.rs                       |   0
 .../src/api/cast/v512.rs                      |   0
 .../src/api/cast/v64.rs                       |   0
 .../src/api/cmp.rs                            |   0
 .../src/api/cmp/eq.rs                         |   0
 .../src/api/cmp/ord.rs                        |   0
 .../src/api/cmp/partial_eq.rs                 |   0
 .../src/api/cmp/partial_ord.rs                |   0
 .../src/api/cmp/vertical.rs                   |   0
 .../src/api/default.rs                        |   0
 .../src/api/fmt.rs                            |   0
 .../src/api/fmt/binary.rs                     |   0
 .../src/api/fmt/debug.rs                      |   0
 .../src/api/fmt/lower_hex.rs                  |   0
 .../src/api/fmt/octal.rs                      |   0
 .../src/api/fmt/upper_hex.rs                  |   0
 .../src/api/from.rs                           |   0
 .../src/api/from/from_array.rs                |   1 +
 .../src/api/from/from_vector.rs               |   0
 .../src/api/hash.rs                           |   0
 .../src/api/into_bits.rs                      |   2 +
 .../src/api/into_bits/arch_specific.rs        |   0
 .../src/api/into_bits/macros.rs               |   0
 .../src/api/into_bits/v128.rs                 |   0
 .../src/api/into_bits/v16.rs                  |   0
 .../src/api/into_bits/v256.rs                 |   0
 .../src/api/into_bits/v32.rs                  |   0
 .../src/api/into_bits/v512.rs                 |   0
 .../src/api/into_bits/v64.rs                  |   0
 .../src/api/math.rs                           |   0
 .../src/api/math/float.rs                     |   0
 .../src/api/math/float/abs.rs                 |   0
 .../src/api/math/float/consts.rs              |   0
 .../src/api/math/float/cos.rs                 |   0
 .../src/api/math/float/exp.rs                 |   0
 .../src/api/math/float/ln.rs                  |   0
 .../src/api/math/float/mul_add.rs             |   0
 .../src/api/math/float/mul_adde.rs            |   0
 .../src/api/math/float/powf.rs                |   0
 .../src/api/math/float/recpre.rs              |   0
 .../src/api/math/float/rsqrte.rs              |   0
 .../src/api/math/float/sin.rs                 |   0
 .../src/api/math/float/sqrt.rs                |   0
 .../src/api/math/float/sqrte.rs               |   0
 .../src/api/minimal.rs                        |   0
 .../src/api/minimal/iuf.rs                    |   0
 .../src/api/minimal/mask.rs                   |   0
 .../src/api/minimal/ptr.rs                    |  16 +-
 .../src/api/ops.rs                            |   0
 .../src/api/ops/scalar_arithmetic.rs          |   0
 .../src/api/ops/scalar_bitwise.rs             |   0
 .../src/api/ops/scalar_mask_bitwise.rs        |   0
 .../src/api/ops/scalar_shifts.rs              |   0
 .../src/api/ops/vector_arithmetic.rs          |   0
 .../src/api/ops/vector_bitwise.rs             |   0
 .../src/api/ops/vector_float_min_max.rs       |   0
 .../src/api/ops/vector_int_min_max.rs         |   0
 .../src/api/ops/vector_mask_bitwise.rs        |   0
 .../src/api/ops/vector_neg.rs                 |   0
 .../src/api/ops/vector_rotates.rs             |   4 +-
 .../src/api/ops/vector_shifts.rs              |   0
 .../src/api/ptr.rs                            |   0
 .../src/api/ptr/gather_scatter.rs             |   0
 .../src/api/reductions.rs                     |   0
 .../src/api/reductions/bitwise.rs             |   0
 .../src/api/reductions/float_arithmetic.rs    |   0
 .../src/api/reductions/integer_arithmetic.rs  |   0
 .../src/api/reductions/mask.rs                |   0
 .../src/api/reductions/min_max.rs             |   0
 .../src/api/select.rs                         |   0
 .../src/api/shuffle.rs                        |   4 +-
 .../src/api/shuffle1_dyn.rs                   |   0
 .../src/api/slice.rs                          |   0
 .../src/api/slice/from_slice.rs               |   6 +-
 .../src/api/slice/write_to_slice.rs           |   6 +-
 .../src/api/swap_bytes.rs                     |   2 +-
 .../src/codegen.rs                            |   0
 .../src/codegen/bit_manip.rs                  |   0
 .../src/codegen/llvm.rs                       |  20 +-
 .../src/codegen/math.rs                       |   0
 .../src/codegen/math/float.rs                 |   0
 .../src/codegen/math/float/abs.rs             |   0
 .../src/codegen/math/float/cos.rs             |   0
 .../src/codegen/math/float/cos_pi.rs          |   0
 .../src/codegen/math/float/exp.rs             |   0
 .../src/codegen/math/float/ln.rs              |   0
 .../src/codegen/math/float/macros.rs          |   0
 .../src/codegen/math/float/mul_add.rs         |   0
 .../src/codegen/math/float/mul_adde.rs        |   0
 .../src/codegen/math/float/powf.rs            |   0
 .../src/codegen/math/float/sin.rs             |   0
 .../src/codegen/math/float/sin_cos_pi.rs      |   0
 .../src/codegen/math/float/sin_pi.rs          |   0
 .../src/codegen/math/float/sqrt.rs            |   0
 .../src/codegen/math/float/sqrte.rs           |   0
 .../src/codegen/pointer_sized_int.rs          |   0
 .../src/codegen/reductions.rs                 |   0
 .../src/codegen/reductions/mask.rs            |   0
 .../src/codegen/reductions/mask/aarch64.rs    |   0
 .../src/codegen/reductions/mask/arm.rs        |   0
 .../src/codegen/reductions/mask/fallback.rs   |   0
 .../codegen/reductions/mask/fallback_impl.rs  |   0
 .../src/codegen/reductions/mask/x86.rs        |   0
 .../src/codegen/reductions/mask/x86/avx.rs    |   0
 .../src/codegen/reductions/mask/x86/avx2.rs   |   0
 .../src/codegen/reductions/mask/x86/sse.rs    |   0
 .../src/codegen/reductions/mask/x86/sse2.rs   |   0
 .../src/codegen/shuffle.rs                    |   0
 .../src/codegen/shuffle1_dyn.rs               |   0
 .../src/codegen/swap_bytes.rs                 |   0
 .../src/codegen/v128.rs                       |   0
 .../src/codegen/v16.rs                        |   0
 .../src/codegen/v256.rs                       |   0
 .../src/codegen/v32.rs                        |   0
 .../src/codegen/v512.rs                       |   0
 .../src/codegen/v64.rs                        |   0
 .../src/codegen/vPtr.rs                       |   0
 .../src/codegen/vSize.rs                      |   0
 .../{packed_simd_2 => packed_simd}/src/lib.rs |  15 +-
 .../src/masks.rs                              |   0
 .../src/sealed.rs                             |   0
 .../src/testing.rs                            |   0
 .../src/testing/macros.rs                     |   0
 .../src/testing/utils.rs                      |   0
 .../src/v128.rs                               |   0
 .../{packed_simd_2 => packed_simd}/src/v16.rs |   0
 .../src/v256.rs                               |   0
 .../{packed_simd_2 => packed_simd}/src/v32.rs |   0
 .../src/v512.rs                               |   0
 .../{packed_simd_2 => packed_simd}/src/v64.rs |   0
 .../src/vPtr.rs                               |   0
 .../src/vSize.rs                              |   0
 .../tests/endianness.rs                       |   2 +-
 .../rust/packed_simd_2/.cargo-checksum.json   |   1 -
 .../packed_simd_2/ci/android-install-ndk.sh   |  37 ---
 228 files changed, 514 insertions(+), 172 deletions(-)
 rename third_party/rust/{packed_simd_2 => packed_simd}/.appveyor.yml (100%)
 create mode 100644 third_party/rust/packed_simd/.cargo-checksum.json
 create mode 100644 third_party/rust/packed_simd/.github/workflows/benchmarks.yml
 create mode 100644 third_party/rust/packed_simd/.github/workflows/ci.yml
 create mode 100644 third_party/rust/packed_simd/.github/workflows/docs.yml
 create mode 100644 third_party/rust/packed_simd/.github/workflows/run-ci-script.yml
 rename third_party/rust/{packed_simd_2 => packed_simd}/.travis.yml (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/Cargo.toml (84%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/LICENSE-APACHE (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/LICENSE-MIT (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/README.md (76%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/bors.toml (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/build.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/all.sh (100%)
 create mode 100644 third_party/rust/packed_simd/ci/android-install-ndk.sh
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/android-install-sdk.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/android-sysimage.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/benchmark.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/deploy_and_run_on_ios_simulator.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/aarch64-linux-android/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/aarch64-unknown-linux-gnu/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/arm-unknown-linux-gnueabi/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2/ci/docker/arm-linux-androideabi => packed_simd/ci/docker/armv7-linux-androideabi}/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/i586-unknown-linux-gnu/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/i686-unknown-linux-gnu/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/mips-unknown-linux-gnu/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/mipsel-unknown-linux-musl/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/powerpc-unknown-linux-gnu/Dockerfile (96%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile (96%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile (96%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/s390x-unknown-linux-gnu/Dockerfile (90%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/sparc64-unknown-linux-gnu/Dockerfile (92%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/thumbv7neon-linux-androideabi/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/wasm32-unknown-unknown/Dockerfile (86%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/x86_64-linux-android/Dockerfile (62%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/docker/x86_64-unknown-linux-gnu/Dockerfile (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/dox.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/linux-s390x.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/linux-sparc64.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/lld-shim.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/max_line_width.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/run-docker.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/run.sh (96%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/run_examples.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/runtest-android.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/setup_benchmarks.sh (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/ci/test-runner-linux (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/contributing.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/.gitignore (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/book.toml (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/SUMMARY.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/ascii.css (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/bound_checks.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/float-math/approx.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/float-math/fma.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/float-math/fp.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/float-math/svml.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/introduction.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/prof/linux.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/prof/mca.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/prof/profiling.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/attribute.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/features.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/inlining.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/practice.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/runtime.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/target-feature/rustflags.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/perf-guide/src/vert-hor-ops.md (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/rustfmt.toml (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/bit_manip.rs (99%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/bitmask.rs (91%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/macros.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v128.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v16.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v256.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v32.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v512.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cast/v64.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp/eq.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp/ord.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp/partial_eq.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp/partial_ord.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/cmp/vertical.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/default.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt/binary.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt/debug.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt/lower_hex.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt/octal.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/fmt/upper_hex.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/from.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/from/from_array.rs (99%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/from/from_vector.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/hash.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits.rs (91%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/arch_specific.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/macros.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v128.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v16.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v256.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v32.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v512.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/into_bits/v64.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/abs.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/consts.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/cos.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/exp.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/ln.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/mul_add.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/mul_adde.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/powf.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/recpre.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/rsqrte.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/sin.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/sqrt.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/math/float/sqrte.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/minimal.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/minimal/iuf.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/minimal/mask.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/minimal/ptr.rs (99%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/scalar_arithmetic.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/scalar_bitwise.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/scalar_mask_bitwise.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/scalar_shifts.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_arithmetic.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_bitwise.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_float_min_max.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_int_min_max.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_mask_bitwise.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_neg.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_rotates.rs (97%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ops/vector_shifts.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ptr.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/ptr/gather_scatter.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions/bitwise.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions/float_arithmetic.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions/integer_arithmetic.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions/mask.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/reductions/min_max.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/select.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/shuffle.rs (99%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/shuffle1_dyn.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/slice.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/slice/from_slice.rs (97%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/slice/write_to_slice.rs (97%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/api/swap_bytes.rs (99%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/bit_manip.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/llvm.rs (85%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/abs.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/cos.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/cos_pi.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/exp.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/ln.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/macros.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/mul_add.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/mul_adde.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/powf.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/sin.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/sin_cos_pi.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/sin_pi.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/sqrt.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/math/float/sqrte.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/pointer_sized_int.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/aarch64.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/arm.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/fallback.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/fallback_impl.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/x86.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/x86/avx.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/x86/avx2.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/x86/sse.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/reductions/mask/x86/sse2.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/shuffle.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/shuffle1_dyn.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/swap_bytes.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v128.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v16.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v256.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v32.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v512.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/v64.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/vPtr.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/codegen/vSize.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/lib.rs (98%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/masks.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/sealed.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/testing.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/testing/macros.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/testing/utils.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v128.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v16.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v256.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v32.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v512.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/v64.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/vPtr.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/src/vSize.rs (100%)
 rename third_party/rust/{packed_simd_2 => packed_simd}/tests/endianness.rs (99%)
 delete mode 100644 third_party/rust/packed_simd_2/.cargo-checksum.json
 delete mode 100644 third_party/rust/packed_simd_2/ci/android-install-ndk.sh

diff --git a/.cargo/config.in b/.cargo/config.in
index 6346ed2a94d1..e01bde536d68 100644
--- a/.cargo/config.in
+++ b/.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"]
diff --git a/Cargo.lock b/Cargo.lock
index 6b6e266d8bf1..c3c7797b578b 100644
--- a/Cargo.lock
+++ b/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]]
diff --git a/Cargo.toml b/Cargo.toml
index 1437c7176330..2f051818f135 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -187,7 +187,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" }
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index 5d1d5470b33a..2159e127cae5 100644
--- a/config/makefiles/rust.mk
+++ b/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
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 46f58d6b8c2e..2ffc23863e33 100644
--- a/supply-chain/audits.toml
+++ b/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"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 2af18036af70..78e339aa0136 100644
--- a/supply-chain/config.toml
+++ b/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."
 
@@ -651,8 +651,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]]
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index cfcf97be2d96..ab301b268395 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -169,6 +169,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"
diff --git a/third_party/rust/encoding_rs/.cargo-checksum.json b/third_party/rust/encoding_rs/.cargo-checksum.json
index 73c871fbd9be..a5e1f1ba2513 100644
--- a/third_party/rust/encoding_rs/.cargo-checksum.json
+++ b/third_party/rust/encoding_rs/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"ea1bdb0b73a66e4a6b25d8fdda6b64cadea8e99ac89f9739eeada6801d5e9010","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"8781ee38bba8ab4e752b2d63d7674d8ce4a557af896221434dd057a1198a9ed4","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58b
\ No newline at end of file
+{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"42fa83322aa9fd6723b77d35d0cacb92cbb6e7f573ce11c55f5225292866f8f4","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"d938e8ab0b9ab67e74a1a4f48f23fdce956d0ad3a3f6147ae7612a92763c88d5","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58b
\ No newline at end of file
diff --git a/third_party/rust/encoding_rs/Cargo.toml b/third_party/rust/encoding_rs/Cargo.toml
index e70b14204dd9..e9fd6c0af257 100644
--- a/third_party/rust/encoding_rs/Cargo.toml
+++ b/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"
diff --git a/third_party/rust/encoding_rs/README.md b/third_party/rust/encoding_rs/README.md
index db61beefbb72..c0b596c95199 100644
--- a/third_party/rust/encoding_rs/README.md
+++ b/third_party/rust/encoding_rs/README.md
@@ -167,28 +167,28 @@ 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").
 
 Currently, this has not been tested to be an improvement except for these
 targets:
 
 * x86_64
 * i686
 * aarch64
 * thumbv7neon
 
 If you use nightly Rust, you use targets whose first component is one of the
 above, and you are prepared _to have to revise your configuration when updating
 Rust_, you should enable this feature. Otherwise, please _do not_ enable this
 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.)
diff --git a/third_party/rust/packed_simd_2/.appveyor.yml b/third_party/rust/packed_simd/.appveyor.yml
similarity index 100%
rename from third_party/rust/packed_simd_2/.appveyor.yml
rename to third_party/rust/packed_simd/.appveyor.yml
diff --git a/third_party/rust/packed_simd/.cargo-checksum.json b/third_party/rust/packed_simd/.cargo-checksum.json
new file mode 100644
index 000000000000..92964c642b27
--- /dev/null
+++ b/third_party/rust/packed_simd/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".github/workflows/benchmarks.yml":"d049f016dc53830a3fcc735833eca168df2e491f33b6b44ce7e4d5d1dd453854",".github/workflows/ci.yml":"170a2074add57ddc8f88b780149e4930162c6ee4718add4369dca8e3fd6c022a",".github/workflows/docs.yml":"86f7eb652c900624e4deb76320cd92175db1fa7295a76f28f30336ff0fad1604",".github/workflows/run-ci-script.yml":"d847be293f9ec17038e450652b1eb7bdc20b805c18c5dbab34d1d9ff7a9c8940",".travis.yml":"30a61a5ec53355fc1f3585e1690280308c2b7961701abc11e8389b235b647178","Cargo.toml":"02151c415f267a6aeb8651158472744d71e1d9da8883dd20be25731a42e520f4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"c4ac7027a9ab7d7858aa8957d7454dbfcdbb81e605b6a171f05310cc3cad3762","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"019ed29c43989782d8eec3a961654cfc172d7a7898da4eca8f654700af7e1988","ci/all.sh":"2ae6b2445b4db83833e40b37efd0016c6b9879ee988b9b3ef94db5439a3e1606","ci/android-install-ndk.sh":"bdcf93ba9043ac1184e2c504a3d40c47c6c1601d882e0f0a27a8eb56fbabcb5f","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"da88c0d50f16dc08448c7fdf1fa5ed2cbe576acf9e7dd85b5b818621b2a8c702","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"bb5f8ae890707c128652290ffc544447643bf12037ddd73c6ad6989f848cb380","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"1afaefcbc05b740859acd4e067bc92439be6bcbe8f2e9678474fb434bcd398d9","ci/docker/armv7-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"8282ea707a94109beed47a57574755e2d58401735904a03f85fb64c578c53b4f","ci/docker/i586-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/i686-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/mips-unknown-linux-gnu/Dockerfile":"b2ebc25797612c4f8395fe9d407725156044955bfbcf442036b7f55b43a5f9da","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"b0c1692ac65bc56dd30494b1993d8e929c48cc9c4b92029b7c7592af6d4f9220","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"4e9249c179300138141d0b2b7401b11897f64aed69f541f078c1db4594df2827","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"3164c52b0dcbb01afa78292b15b5c43503ccf0491cf6eb801ec2bf22ae274e52","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"ae8274309928620a5dd232a46264e05399bb746288ebee3843a71c4162208cc3","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"ba5fbc4bf3bb91cd50b407248da31225681efc8f2be7618f4a0ab1219b389508","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"53f97f8b9b5aca7534b9bf9ea48f35175052cd2a560a107e01ad270731c032fc","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"89f5421cf06d817ae94092987e914472ef384ad2d1fff2735be3d8786ba11214","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"83eba19576486f9d10d7c037d669d72b31a65565a479f30b22aab36aaa2ff8dc","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"51955a8bf3c4d440f47382af6f5426ebff94ab01a04da36175babda9a057740f","ci/docker/wasm32-unknown-unknown/Dockerfile":"b982b421c70db476900df5b60e19ef8815e6c7dae22687225002780cab7b0a76","ci/docker/x86_64-linux-android/Dockerfile":"a17ebdb186ce2dd6b62100b5a439e05a1ab9adab113e2508843e121aaea52992","ci/docker/x86_64-unknown-linux-gnu-emulat
\ No newline at end of file
diff --git a/third_party/rust/packed_simd/.github/workflows/benchmarks.yml b/third_party/rust/packed_simd/.github/workflows/benchmarks.yml
new file mode 100644
index 000000000000..2102661b2945
--- /dev/null
+++ b/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
diff --git a/third_party/rust/packed_simd/.github/workflows/ci.yml b/third_party/rust/packed_simd/.github/workflows/ci.yml
new file mode 100644
index 000000000000..15f096370c25
--- /dev/null
+++ b/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
diff --git a/third_party/rust/packed_simd/.github/workflows/docs.yml b/third_party/rust/packed_simd/.github/workflows/docs.yml
new file mode 100644
index 000000000000..54bdc240aa0c
--- /dev/null
+++ b/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
diff --git a/third_party/rust/packed_simd/.github/workflows/run-ci-script.yml b/third_party/rust/packed_simd/.github/workflows/run-ci-script.yml
new file mode 100644
index 000000000000..733c53965912
--- /dev/null
+++ b/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 }}
diff --git a/third_party/rust/packed_simd_2/.travis.yml b/third_party/rust/packed_simd/.travis.yml
similarity index 100%
rename from third_party/rust/packed_simd_2/.travis.yml
rename to third_party/rust/packed_simd/.travis.yml
diff --git a/third_party/rust/packed_simd_2/Cargo.toml b/third_party/rust/packed_simd/Cargo.toml
similarity index 84%
rename from third_party/rust/packed_simd_2/Cargo.toml
rename to third_party/rust/packed_simd/Cargo.toml
index 78b613eae9d6..a8d2f971e6b4 100644
--- a/third_party/rust/packed_simd_2/Cargo.toml
+++ b/third_party/rust/packed_simd/Cargo.toml
@@ -11,68 +11,70 @@
 
 [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"
 documentation = "https://docs.rs/crate/packed_simd/"
 readme = "README.md"
 keywords = [
     "simd",
     "vector",
     "portability",
 ]
 categories = [
     "hardware-support",
     "concurrency",
     "no-std",
     "data-structures",
 ]
 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"
 
 [dependencies.core_arch]
 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"
 default-features = false
 
 [features]
 default = []
 into_bits = []
 libcore_neon = []
 
 [target."cfg(target_arch = \"x86_64\")".dependencies.sleef-sys]
 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"
 
 [badges.is-it-maintained-open-issues]
 repository = "rust-lang/packed_simd"
 
 [badges.maintenance]
 status = "experimental"
-
-[badges.travis-ci]
-repository = "rust-lang/packed_simd"
diff --git a/third_party/rust/packed_simd_2/LICENSE-APACHE b/third_party/rust/packed_simd/LICENSE-APACHE
similarity index 100%
rename from third_party/rust/packed_simd_2/LICENSE-APACHE
rename to third_party/rust/packed_simd/LICENSE-APACHE
diff --git a/third_party/rust/packed_simd_2/LICENSE-MIT b/third_party/rust/packed_simd/LICENSE-MIT
similarity index 100%
rename from third_party/rust/packed_simd_2/LICENSE-MIT
rename to third_party/rust/packed_simd/LICENSE-MIT
diff --git a/third_party/rust/packed_simd_2/README.md b/third_party/rust/packed_simd/README.md
similarity index 76%
rename from third_party/rust/packed_simd_2/README.md
rename to third_party/rust/packed_simd/README.md
index eb3101c33d15..59db13fe4f94 100644
--- a/third_party/rust/packed_simd_2/README.md
+++ b/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/
diff --git a/third_party/rust/packed_simd_2/bors.toml b/third_party/rust/packed_simd/bors.toml
similarity index 100%
rename from third_party/rust/packed_simd_2/bors.toml
rename to third_party/rust/packed_simd/bors.toml
diff --git a/third_party/rust/packed_simd_2/build.rs b/third_party/rust/packed_simd/build.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/build.rs
rename to third_party/rust/packed_simd/build.rs
diff --git a/third_party/rust/packed_simd_2/ci/all.sh b/third_party/rust/packed_simd/ci/all.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/all.sh
rename to third_party/rust/packed_simd/ci/all.sh
diff --git a/third_party/rust/packed_simd/ci/android-install-ndk.sh b/third_party/rust/packed_simd/ci/android-install-ndk.sh
new file mode 100644
index 000000000000..5370853937c7
--- /dev/null
+++ b/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-*
diff --git a/third_party/rust/packed_simd_2/ci/android-install-sdk.sh b/third_party/rust/packed_simd/ci/android-install-sdk.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/android-install-sdk.sh
rename to third_party/rust/packed_simd/ci/android-install-sdk.sh
diff --git a/third_party/rust/packed_simd_2/ci/android-sysimage.sh b/third_party/rust/packed_simd/ci/android-sysimage.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/android-sysimage.sh
rename to third_party/rust/packed_simd/ci/android-sysimage.sh
diff --git a/third_party/rust/packed_simd_2/ci/benchmark.sh b/third_party/rust/packed_simd/ci/benchmark.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/benchmark.sh
rename to third_party/rust/packed_simd/ci/benchmark.sh
diff --git a/third_party/rust/packed_simd_2/ci/deploy_and_run_on_ios_simulator.rs b/third_party/rust/packed_simd/ci/deploy_and_run_on_ios_simulator.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/deploy_and_run_on_ios_simulator.rs
rename to third_party/rust/packed_simd/ci/deploy_and_run_on_ios_simulator.rs
diff --git a/third_party/rust/packed_simd_2/ci/docker/aarch64-linux-android/Dockerfile b/third_party/rust/packed_simd/ci/docker/aarch64-linux-android/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/aarch64-linux-android/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/aarch64-linux-android/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/arm-unknown-linux-gnueabi/Dockerfile b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/arm-linux-androideabi/Dockerfile b/third_party/rust/packed_simd/ci/docker/armv7-linux-androideabi/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/arm-linux-androideabi/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/armv7-linux-androideabi/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/i586-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/i586-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/i686-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/i686-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/mips-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/mips-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/mipsel-unknown-linux-musl/Dockerfile b/third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/mipsel-unknown-linux-musl/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
similarity index 96%
rename from third_party/rust/packed_simd_2/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
index 80cfee8ab5b9..15ba58e60ce2 100644
--- a/third_party/rust/packed_simd_2/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
+++ b/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 \
diff --git a/third_party/rust/packed_simd_2/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
similarity index 96%
rename from third_party/rust/packed_simd_2/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
index 74031a2a3e6f..21c296dc442a 100644
--- a/third_party/rust/packed_simd_2/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
+++ b/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 \
diff --git a/third_party/rust/packed_simd_2/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
similarity index 96%
rename from third_party/rust/packed_simd_2/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
index 471a7d9651f7..8034145fc06e 100644
--- a/third_party/rust/packed_simd_2/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
+++ b/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 \
diff --git a/third_party/rust/packed_simd_2/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/s390x-unknown-linux-gnu/Dockerfile
similarity index 90%
rename from third_party/rust/packed_simd_2/ci/docker/s390x-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/s390x-unknown-linux-gnu/Dockerfile
index c645b0bcc2b8..e785ca370c4d 100644
--- a/third_party/rust/packed_simd_2/ci/docker/s390x-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/s390x-unknown-linux-gnu/Dockerfile
@@ -1,20 +1,20 @@
-FROM ubuntu:18.10
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     ca-certificates \
     curl \
     cmake \
     gcc \
     libc6-dev \
     g++-s390x-linux-gnu \
     libc6-dev-s390x-cross \
     qemu-user \
     make \
     file
 
 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
\ No newline at end of file
+    OBJDUMP=s390x-linux-gnu-objdump
diff --git a/third_party/rust/packed_simd_2/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
similarity index 92%
rename from third_party/rust/packed_simd_2/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
index fe12af14da6f..c35f4d8f31a7 100644
--- a/third_party/rust/packed_simd_2/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -1,18 +1,18 @@
-FROM debian:stretch
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \
         gcc libc6-dev \
         gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \
         qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
         p7zip-full cpio
 
 COPY linux-sparc64.sh /
 RUN bash /linux-sparc64.sh
 
 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
\ No newline at end of file
+    PATH=$PATH:/rust/bin
diff --git a/third_party/rust/packed_simd_2/ci/docker/thumbv7neon-linux-androideabi/Dockerfile b/third_party/rust/packed_simd/ci/docker/thumbv7neon-linux-androideabi/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/thumbv7neon-linux-androideabi/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/thumbv7neon-linux-androideabi/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/wasm32-unknown-unknown/Dockerfile b/third_party/rust/packed_simd/ci/docker/wasm32-unknown-unknown/Dockerfile
similarity index 86%
rename from third_party/rust/packed_simd_2/ci/docker/wasm32-unknown-unknown/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/wasm32-unknown-unknown/Dockerfile
index bd97170bc7e8..51ee13e6c975 100644
--- a/third_party/rust/packed_simd_2/ci/docker/wasm32-unknown-unknown/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/wasm32-unknown-unknown/Dockerfile
@@ -1,26 +1,27 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
   ca-certificates \
   clang \
   cmake \
   curl \
   git \
   libc6-dev \
   make \
-  python \
+  ninja-build \
+  python-is-python3 \
   xz-utils
 
 # Install `wasm2wat`
 RUN git clone --recursive https://github.com/WebAssembly/wabt
 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`
diff --git a/third_party/rust/packed_simd_2/ci/docker/x86_64-linux-android/Dockerfile b/third_party/rust/packed_simd/ci/docker/x86_64-linux-android/Dockerfile
similarity index 62%
rename from third_party/rust/packed_simd_2/ci/docker/x86_64-linux-android/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/x86_64-linux-android/Dockerfile
index d52dd45b12bf..785936d347d2 100644
--- a/third_party/rust/packed_simd_2/ci/docker/x86_64-linux-android/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/x86_64-linux-android/Dockerfile
@@ -1,29 +1,31 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
   ca-certificates \
   curl \
   gcc \
   libc-dev \
   python \
   unzip \
   file \
   make
 
 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
diff --git a/third_party/rust/packed_simd_2/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile b/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
rename to third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
diff --git a/third_party/rust/packed_simd_2/ci/dox.sh b/third_party/rust/packed_simd/ci/dox.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/dox.sh
rename to third_party/rust/packed_simd/ci/dox.sh
diff --git a/third_party/rust/packed_simd_2/ci/linux-s390x.sh b/third_party/rust/packed_simd/ci/linux-s390x.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/linux-s390x.sh
rename to third_party/rust/packed_simd/ci/linux-s390x.sh
diff --git a/third_party/rust/packed_simd_2/ci/linux-sparc64.sh b/third_party/rust/packed_simd/ci/linux-sparc64.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/linux-sparc64.sh
rename to third_party/rust/packed_simd/ci/linux-sparc64.sh
diff --git a/third_party/rust/packed_simd_2/ci/lld-shim.rs b/third_party/rust/packed_simd/ci/lld-shim.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/lld-shim.rs
rename to third_party/rust/packed_simd/ci/lld-shim.rs
diff --git a/third_party/rust/packed_simd_2/ci/max_line_width.sh b/third_party/rust/packed_simd/ci/max_line_width.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/max_line_width.sh
rename to third_party/rust/packed_simd/ci/max_line_width.sh
diff --git a/third_party/rust/packed_simd_2/ci/run-docker.sh b/third_party/rust/packed_simd/ci/run-docker.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/run-docker.sh
rename to third_party/rust/packed_simd/ci/run-docker.sh
diff --git a/third_party/rust/packed_simd_2/ci/run.sh b/third_party/rust/packed_simd/ci/run.sh
similarity index 96%
rename from third_party/rust/packed_simd_2/ci/run.sh
rename to third_party/rust/packed_simd/ci/run.sh
index 428a5d890257..b1b22ebd7c80 100755
--- a/third_party/rust/packed_simd_2/ci/run.sh
+++ b/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
diff --git a/third_party/rust/packed_simd_2/ci/run_examples.sh b/third_party/rust/packed_simd/ci/run_examples.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/run_examples.sh
rename to third_party/rust/packed_simd/ci/run_examples.sh
diff --git a/third_party/rust/packed_simd_2/ci/runtest-android.rs b/third_party/rust/packed_simd/ci/runtest-android.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/runtest-android.rs
rename to third_party/rust/packed_simd/ci/runtest-android.rs
diff --git a/third_party/rust/packed_simd_2/ci/setup_benchmarks.sh b/third_party/rust/packed_simd/ci/setup_benchmarks.sh
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/setup_benchmarks.sh
rename to third_party/rust/packed_simd/ci/setup_benchmarks.sh
diff --git a/third_party/rust/packed_simd_2/ci/test-runner-linux b/third_party/rust/packed_simd/ci/test-runner-linux
similarity index 100%
rename from third_party/rust/packed_simd_2/ci/test-runner-linux
rename to third_party/rust/packed_simd/ci/test-runner-linux
diff --git a/third_party/rust/packed_simd_2/contributing.md b/third_party/rust/packed_simd/contributing.md
similarity index 100%
rename from third_party/rust/packed_simd_2/contributing.md
rename to third_party/rust/packed_simd/contributing.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/.gitignore b/third_party/rust/packed_simd/perf-guide/.gitignore
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/.gitignore
rename to third_party/rust/packed_simd/perf-guide/.gitignore
diff --git a/third_party/rust/packed_simd_2/perf-guide/book.toml b/third_party/rust/packed_simd/perf-guide/book.toml
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/book.toml
rename to third_party/rust/packed_simd/perf-guide/book.toml
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/SUMMARY.md b/third_party/rust/packed_simd/perf-guide/src/SUMMARY.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/SUMMARY.md
rename to third_party/rust/packed_simd/perf-guide/src/SUMMARY.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/ascii.css b/third_party/rust/packed_simd/perf-guide/src/ascii.css
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/ascii.css
rename to third_party/rust/packed_simd/perf-guide/src/ascii.css
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/bound_checks.md b/third_party/rust/packed_simd/perf-guide/src/bound_checks.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/bound_checks.md
rename to third_party/rust/packed_simd/perf-guide/src/bound_checks.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/float-math/approx.md b/third_party/rust/packed_simd/perf-guide/src/float-math/approx.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/float-math/approx.md
rename to third_party/rust/packed_simd/perf-guide/src/float-math/approx.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/float-math/fma.md b/third_party/rust/packed_simd/perf-guide/src/float-math/fma.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/float-math/fma.md
rename to third_party/rust/packed_simd/perf-guide/src/float-math/fma.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/float-math/fp.md b/third_party/rust/packed_simd/perf-guide/src/float-math/fp.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/float-math/fp.md
rename to third_party/rust/packed_simd/perf-guide/src/float-math/fp.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/float-math/svml.md b/third_party/rust/packed_simd/perf-guide/src/float-math/svml.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/float-math/svml.md
rename to third_party/rust/packed_simd/perf-guide/src/float-math/svml.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/introduction.md b/third_party/rust/packed_simd/perf-guide/src/introduction.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/introduction.md
rename to third_party/rust/packed_simd/perf-guide/src/introduction.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/prof/linux.md b/third_party/rust/packed_simd/perf-guide/src/prof/linux.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/prof/linux.md
rename to third_party/rust/packed_simd/perf-guide/src/prof/linux.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/prof/mca.md b/third_party/rust/packed_simd/perf-guide/src/prof/mca.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/prof/mca.md
rename to third_party/rust/packed_simd/perf-guide/src/prof/mca.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/prof/profiling.md b/third_party/rust/packed_simd/perf-guide/src/prof/profiling.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/prof/profiling.md
rename to third_party/rust/packed_simd/perf-guide/src/prof/profiling.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/attribute.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/attribute.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/attribute.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/attribute.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/features.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/features.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/features.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/features.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/inlining.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/inlining.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/inlining.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/inlining.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/practice.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/practice.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/practice.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/practice.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/runtime.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/runtime.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/runtime.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/runtime.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/target-feature/rustflags.md b/third_party/rust/packed_simd/perf-guide/src/target-feature/rustflags.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/target-feature/rustflags.md
rename to third_party/rust/packed_simd/perf-guide/src/target-feature/rustflags.md
diff --git a/third_party/rust/packed_simd_2/perf-guide/src/vert-hor-ops.md b/third_party/rust/packed_simd/perf-guide/src/vert-hor-ops.md
similarity index 100%
rename from third_party/rust/packed_simd_2/perf-guide/src/vert-hor-ops.md
rename to third_party/rust/packed_simd/perf-guide/src/vert-hor-ops.md
diff --git a/third_party/rust/packed_simd_2/rustfmt.toml b/third_party/rust/packed_simd/rustfmt.toml
similarity index 100%
rename from third_party/rust/packed_simd_2/rustfmt.toml
rename to third_party/rust/packed_simd/rustfmt.toml
diff --git a/third_party/rust/packed_simd_2/src/api.rs b/third_party/rust/packed_simd/src/api.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api.rs
rename to third_party/rust/packed_simd/src/api.rs
diff --git a/third_party/rust/packed_simd_2/src/api/bit_manip.rs b/third_party/rust/packed_simd/src/api/bit_manip.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/src/api/bit_manip.rs
rename to third_party/rust/packed_simd/src/api/bit_manip.rs
index 6d8865706d3e..c1e90bb0fb85 100644
--- a/third_party/rust/packed_simd_2/src/api/bit_manip.rs
+++ b/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)]
diff --git a/third_party/rust/packed_simd_2/src/api/bitmask.rs b/third_party/rust/packed_simd/src/api/bitmask.rs
similarity index 91%
rename from third_party/rust/packed_simd_2/src/api/bitmask.rs
rename to third_party/rust/packed_simd/src/api/bitmask.rs
index a06ff0fab1f4..8f4868f32844 100644
--- a/third_party/rust/packed_simd_2/src/api/bitmask.rs
+++ b/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)]
diff --git a/third_party/rust/packed_simd_2/src/api/cast.rs b/third_party/rust/packed_simd/src/api/cast.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast.rs
rename to third_party/rust/packed_simd/src/api/cast.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/macros.rs b/third_party/rust/packed_simd/src/api/cast/macros.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/macros.rs
rename to third_party/rust/packed_simd/src/api/cast/macros.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v128.rs b/third_party/rust/packed_simd/src/api/cast/v128.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v128.rs
rename to third_party/rust/packed_simd/src/api/cast/v128.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v16.rs b/third_party/rust/packed_simd/src/api/cast/v16.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v16.rs
rename to third_party/rust/packed_simd/src/api/cast/v16.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v256.rs b/third_party/rust/packed_simd/src/api/cast/v256.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v256.rs
rename to third_party/rust/packed_simd/src/api/cast/v256.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v32.rs b/third_party/rust/packed_simd/src/api/cast/v32.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v32.rs
rename to third_party/rust/packed_simd/src/api/cast/v32.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v512.rs b/third_party/rust/packed_simd/src/api/cast/v512.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v512.rs
rename to third_party/rust/packed_simd/src/api/cast/v512.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cast/v64.rs b/third_party/rust/packed_simd/src/api/cast/v64.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cast/v64.rs
rename to third_party/rust/packed_simd/src/api/cast/v64.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp.rs b/third_party/rust/packed_simd/src/api/cmp.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp.rs
rename to third_party/rust/packed_simd/src/api/cmp.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp/eq.rs b/third_party/rust/packed_simd/src/api/cmp/eq.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp/eq.rs
rename to third_party/rust/packed_simd/src/api/cmp/eq.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp/ord.rs b/third_party/rust/packed_simd/src/api/cmp/ord.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp/ord.rs
rename to third_party/rust/packed_simd/src/api/cmp/ord.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp/partial_eq.rs b/third_party/rust/packed_simd/src/api/cmp/partial_eq.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp/partial_eq.rs
rename to third_party/rust/packed_simd/src/api/cmp/partial_eq.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp/partial_ord.rs b/third_party/rust/packed_simd/src/api/cmp/partial_ord.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp/partial_ord.rs
rename to third_party/rust/packed_simd/src/api/cmp/partial_ord.rs
diff --git a/third_party/rust/packed_simd_2/src/api/cmp/vertical.rs b/third_party/rust/packed_simd/src/api/cmp/vertical.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/cmp/vertical.rs
rename to third_party/rust/packed_simd/src/api/cmp/vertical.rs
diff --git a/third_party/rust/packed_simd_2/src/api/default.rs b/third_party/rust/packed_simd/src/api/default.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/default.rs
rename to third_party/rust/packed_simd/src/api/default.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt.rs b/third_party/rust/packed_simd/src/api/fmt.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt.rs
rename to third_party/rust/packed_simd/src/api/fmt.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt/binary.rs b/third_party/rust/packed_simd/src/api/fmt/binary.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt/binary.rs
rename to third_party/rust/packed_simd/src/api/fmt/binary.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt/debug.rs b/third_party/rust/packed_simd/src/api/fmt/debug.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt/debug.rs
rename to third_party/rust/packed_simd/src/api/fmt/debug.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt/lower_hex.rs b/third_party/rust/packed_simd/src/api/fmt/lower_hex.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt/lower_hex.rs
rename to third_party/rust/packed_simd/src/api/fmt/lower_hex.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt/octal.rs b/third_party/rust/packed_simd/src/api/fmt/octal.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt/octal.rs
rename to third_party/rust/packed_simd/src/api/fmt/octal.rs
diff --git a/third_party/rust/packed_simd_2/src/api/fmt/upper_hex.rs b/third_party/rust/packed_simd/src/api/fmt/upper_hex.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/fmt/upper_hex.rs
rename to third_party/rust/packed_simd/src/api/fmt/upper_hex.rs
diff --git a/third_party/rust/packed_simd_2/src/api/from.rs b/third_party/rust/packed_simd/src/api/from.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/from.rs
rename to third_party/rust/packed_simd/src/api/from.rs
diff --git a/third_party/rust/packed_simd_2/src/api/from/from_array.rs b/third_party/rust/packed_simd/src/api/from/from_array.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/src/api/from/from_array.rs
rename to third_party/rust/packed_simd/src/api/from/from_array.rs
index b83f93816262..5c7801ddaf09 100644
--- a/third_party/rust/packed_simd_2/src/api/from/from_array.rs
+++ b/third_party/rust/packed_simd/src/api/from/from_array.rs
@@ -61,6 +61,7 @@ macro_rules! impl_from_array {
                 mod [<$id _from>] {
                     use super::*;
                     #[test]
+                    #[cfg_attr(miri, ignore)]
                     fn array() {
                         let vec: $id = Default::default();
 
diff --git a/third_party/rust/packed_simd_2/src/api/from/from_vector.rs b/third_party/rust/packed_simd/src/api/from/from_vector.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/from/from_vector.rs
rename to third_party/rust/packed_simd/src/api/from/from_vector.rs
diff --git a/third_party/rust/packed_simd_2/src/api/hash.rs b/third_party/rust/packed_simd/src/api/hash.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/hash.rs
rename to third_party/rust/packed_simd/src/api/hash.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits.rs b/third_party/rust/packed_simd/src/api/into_bits.rs
similarity index 91%
rename from third_party/rust/packed_simd_2/src/api/into_bits.rs
rename to third_party/rust/packed_simd/src/api/into_bits.rs
index 32b6d2ddcee4..03fbe4bff78f 100644
--- a/third_party/rust/packed_simd_2/src/api/into_bits.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits.rs
@@ -1,12 +1,14 @@
 //! Implementation of `FromBits` and `IntoBits`.
 
 /// Safe lossless bitwise conversion from `T` to `Self`.
+#[cfg_attr(doc_cfg, doc(cfg(feature = "into_bits")))]
 pub trait FromBits<T>: crate::marker::Sized {
     /// Safe lossless bitwise transmute from `T` to `Self`.
     fn from_bits(t: T) -> Self;
 }
 
 /// Safe lossless bitwise conversion from `Self` to `T`.
+#[cfg_attr(doc_cfg, doc(cfg(feature = "into_bits")))]
 pub trait IntoBits<T>: crate::marker::Sized {
     /// Safe lossless bitwise transmute from `self` to `T`.
     fn into_bits(self) -> T;
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/arch_specific.rs b/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/arch_specific.rs
rename to third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/macros.rs b/third_party/rust/packed_simd/src/api/into_bits/macros.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/macros.rs
rename to third_party/rust/packed_simd/src/api/into_bits/macros.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v128.rs b/third_party/rust/packed_simd/src/api/into_bits/v128.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v128.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v128.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v16.rs b/third_party/rust/packed_simd/src/api/into_bits/v16.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v16.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v16.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v256.rs b/third_party/rust/packed_simd/src/api/into_bits/v256.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v256.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v256.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v32.rs b/third_party/rust/packed_simd/src/api/into_bits/v32.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v32.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v32.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v512.rs b/third_party/rust/packed_simd/src/api/into_bits/v512.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v512.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v512.rs
diff --git a/third_party/rust/packed_simd_2/src/api/into_bits/v64.rs b/third_party/rust/packed_simd/src/api/into_bits/v64.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/into_bits/v64.rs
rename to third_party/rust/packed_simd/src/api/into_bits/v64.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math.rs b/third_party/rust/packed_simd/src/api/math.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math.rs
rename to third_party/rust/packed_simd/src/api/math.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float.rs b/third_party/rust/packed_simd/src/api/math/float.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float.rs
rename to third_party/rust/packed_simd/src/api/math/float.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/abs.rs b/third_party/rust/packed_simd/src/api/math/float/abs.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/abs.rs
rename to third_party/rust/packed_simd/src/api/math/float/abs.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/consts.rs b/third_party/rust/packed_simd/src/api/math/float/consts.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/consts.rs
rename to third_party/rust/packed_simd/src/api/math/float/consts.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/cos.rs b/third_party/rust/packed_simd/src/api/math/float/cos.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/cos.rs
rename to third_party/rust/packed_simd/src/api/math/float/cos.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/exp.rs b/third_party/rust/packed_simd/src/api/math/float/exp.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/exp.rs
rename to third_party/rust/packed_simd/src/api/math/float/exp.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/ln.rs b/third_party/rust/packed_simd/src/api/math/float/ln.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/ln.rs
rename to third_party/rust/packed_simd/src/api/math/float/ln.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/mul_add.rs b/third_party/rust/packed_simd/src/api/math/float/mul_add.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/mul_add.rs
rename to third_party/rust/packed_simd/src/api/math/float/mul_add.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/mul_adde.rs b/third_party/rust/packed_simd/src/api/math/float/mul_adde.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/mul_adde.rs
rename to third_party/rust/packed_simd/src/api/math/float/mul_adde.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/powf.rs b/third_party/rust/packed_simd/src/api/math/float/powf.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/powf.rs
rename to third_party/rust/packed_simd/src/api/math/float/powf.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/recpre.rs b/third_party/rust/packed_simd/src/api/math/float/recpre.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/recpre.rs
rename to third_party/rust/packed_simd/src/api/math/float/recpre.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/rsqrte.rs b/third_party/rust/packed_simd/src/api/math/float/rsqrte.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/rsqrte.rs
rename to third_party/rust/packed_simd/src/api/math/float/rsqrte.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/sin.rs b/third_party/rust/packed_simd/src/api/math/float/sin.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/sin.rs
rename to third_party/rust/packed_simd/src/api/math/float/sin.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/sqrt.rs b/third_party/rust/packed_simd/src/api/math/float/sqrt.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/sqrt.rs
rename to third_party/rust/packed_simd/src/api/math/float/sqrt.rs
diff --git a/third_party/rust/packed_simd_2/src/api/math/float/sqrte.rs b/third_party/rust/packed_simd/src/api/math/float/sqrte.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/math/float/sqrte.rs
rename to third_party/rust/packed_simd/src/api/math/float/sqrte.rs
diff --git a/third_party/rust/packed_simd_2/src/api/minimal.rs b/third_party/rust/packed_simd/src/api/minimal.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/minimal.rs
rename to third_party/rust/packed_simd/src/api/minimal.rs
diff --git a/third_party/rust/packed_simd_2/src/api/minimal/iuf.rs b/third_party/rust/packed_simd/src/api/minimal/iuf.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/minimal/iuf.rs
rename to third_party/rust/packed_simd/src/api/minimal/iuf.rs
diff --git a/third_party/rust/packed_simd_2/src/api/minimal/mask.rs b/third_party/rust/packed_simd/src/api/minimal/mask.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/minimal/mask.rs
rename to third_party/rust/packed_simd/src/api/minimal/mask.rs
diff --git a/third_party/rust/packed_simd_2/src/api/minimal/ptr.rs b/third_party/rust/packed_simd/src/api/minimal/ptr.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/src/api/minimal/ptr.rs
rename to third_party/rust/packed_simd/src/api/minimal/ptr.rs
index c3d61fbf6d5e..d9e47c9ccbfb 100644
--- a/third_party/rust/packed_simd_2/src/api/minimal/ptr.rs
+++ b/third_party/rust/packed_simd/src/api/minimal/ptr.rs
@@ -583,7 +583,7 @@ macro_rules! impl_minimal_p {
             pub fn from_slice_aligned(slice: &[$elem_ty]) -> Self {
                 unsafe {
                     assert!(slice.len() >= $elem_count);
-                    let target_ptr = slice.get_unchecked(0) as *const $elem_ty;
+                    let target_ptr = slice.as_ptr();
                     assert!(
                         target_ptr.align_offset(crate::mem::align_of::<Self>())
                             == 0
@@ -615,21 +615,20 @@ macro_rules! impl_minimal_p {
             pub unsafe fn from_slice_aligned_unchecked(slice: &[$elem_ty])
                                                        -> Self {
                 #[allow(clippy::cast_ptr_alignment)]
-                *(slice.get_unchecked(0) as *const $elem_ty as *const Self)
+                *(slice.as_ptr().cast())
             }
 
             /// Instantiates a new vector with the values of the `slice`.
             ///
             /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
             pub unsafe fn from_slice_unaligned_unchecked(
                 slice: &[$elem_ty],
             ) -> Self {
                 use crate::mem::size_of;
-                let target_ptr =
-                    slice.get_unchecked(0) as *const $elem_ty as *const u8;
+                let target_ptr = slice.as_ptr().cast();
                 let mut x = Self::splat(crate::ptr::null_mut() as $elem_ty);
                 let self_ptr = &mut x as *mut Self as *mut u8;
                 crate::ptr::copy_nonoverlapping(
@@ -798,8 +797,7 @@ macro_rules! impl_minimal_p {
             pub fn write_to_slice_aligned(self, slice: &mut [$elem_ty]) {
                 unsafe {
                     assert!(slice.len() >= $elem_count);
-                    let target_ptr =
-                        slice.get_unchecked_mut(0) as *mut $elem_ty;
+                    let target_ptr = slice.as_mut_ptr();
                     assert!(
                         target_ptr.align_offset(crate::mem::align_of::<Self>())
                             == 0
@@ -833,21 +831,19 @@ macro_rules! impl_minimal_p {
                 self, slice: &mut [$elem_ty],
             ) {
                 #[allow(clippy::cast_ptr_alignment)]
-                *(slice.get_unchecked_mut(0) as *mut $elem_ty as *mut Self) =
-                    self;
+                *(slice.as_mut_ptr().cast()) = self;
             }
 
             /// Writes the values of the vector to the `slice`.
             ///
             /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
             pub unsafe fn write_to_slice_unaligned_unchecked(
                 self, slice: &mut [$elem_ty],
             ) {
-                let target_ptr =
-                    slice.get_unchecked_mut(0) as *mut $elem_ty as *mut u8;
+                let target_ptr = slice.as_mut_ptr().cast();
                 let self_ptr = &self as *const Self as *const u8;
                 crate::ptr::copy_nonoverlapping(
                     self_ptr,
diff --git a/third_party/rust/packed_simd_2/src/api/ops.rs b/third_party/rust/packed_simd/src/api/ops.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops.rs
rename to third_party/rust/packed_simd/src/api/ops.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/scalar_arithmetic.rs b/third_party/rust/packed_simd/src/api/ops/scalar_arithmetic.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/scalar_arithmetic.rs
rename to third_party/rust/packed_simd/src/api/ops/scalar_arithmetic.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/scalar_bitwise.rs b/third_party/rust/packed_simd/src/api/ops/scalar_bitwise.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/scalar_bitwise.rs
rename to third_party/rust/packed_simd/src/api/ops/scalar_bitwise.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/scalar_mask_bitwise.rs b/third_party/rust/packed_simd/src/api/ops/scalar_mask_bitwise.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/scalar_mask_bitwise.rs
rename to third_party/rust/packed_simd/src/api/ops/scalar_mask_bitwise.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/scalar_shifts.rs b/third_party/rust/packed_simd/src/api/ops/scalar_shifts.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/scalar_shifts.rs
rename to third_party/rust/packed_simd/src/api/ops/scalar_shifts.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_arithmetic.rs b/third_party/rust/packed_simd/src/api/ops/vector_arithmetic.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_arithmetic.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_arithmetic.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_bitwise.rs b/third_party/rust/packed_simd/src/api/ops/vector_bitwise.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_bitwise.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_bitwise.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_float_min_max.rs b/third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_float_min_max.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_int_min_max.rs b/third_party/rust/packed_simd/src/api/ops/vector_int_min_max.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_int_min_max.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_int_min_max.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_mask_bitwise.rs b/third_party/rust/packed_simd/src/api/ops/vector_mask_bitwise.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_mask_bitwise.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_mask_bitwise.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_neg.rs b/third_party/rust/packed_simd/src/api/ops/vector_neg.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_neg.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_neg.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_rotates.rs b/third_party/rust/packed_simd/src/api/ops/vector_rotates.rs
similarity index 97%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_rotates.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_rotates.rs
index 147fc2e37d1f..6c4bed72a2a8 100644
--- a/third_party/rust/packed_simd_2/src/api/ops/vector_rotates.rs
+++ b/third_party/rust/packed_simd/src/api/ops/vector_rotates.rs
@@ -23,8 +23,8 @@ macro_rules! impl_ops_vector_rotates {
             /// amount in the corresponding lane of `n`, wrapping the
             /// truncated bits to the beginning of the resulting integer.
             ///
-            /// Note: this is neither the same operation as `<<` nor equivalent
-            /// to `slice::rotate_left`.
+            /// Note: this is neither the same operation as `>>` nor equivalent
+            /// to `slice::rotate_right`.
             #[inline]
             pub fn rotate_right(self, n: $id) -> $id {
                 const LANE_WIDTH: $elem_ty =
diff --git a/third_party/rust/packed_simd_2/src/api/ops/vector_shifts.rs b/third_party/rust/packed_simd/src/api/ops/vector_shifts.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ops/vector_shifts.rs
rename to third_party/rust/packed_simd/src/api/ops/vector_shifts.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ptr.rs b/third_party/rust/packed_simd/src/api/ptr.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ptr.rs
rename to third_party/rust/packed_simd/src/api/ptr.rs
diff --git a/third_party/rust/packed_simd_2/src/api/ptr/gather_scatter.rs b/third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/ptr/gather_scatter.rs
rename to third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions.rs b/third_party/rust/packed_simd/src/api/reductions.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions.rs
rename to third_party/rust/packed_simd/src/api/reductions.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions/bitwise.rs b/third_party/rust/packed_simd/src/api/reductions/bitwise.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions/bitwise.rs
rename to third_party/rust/packed_simd/src/api/reductions/bitwise.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions/float_arithmetic.rs b/third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions/float_arithmetic.rs
rename to third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions/integer_arithmetic.rs b/third_party/rust/packed_simd/src/api/reductions/integer_arithmetic.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions/integer_arithmetic.rs
rename to third_party/rust/packed_simd/src/api/reductions/integer_arithmetic.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions/mask.rs b/third_party/rust/packed_simd/src/api/reductions/mask.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions/mask.rs
rename to third_party/rust/packed_simd/src/api/reductions/mask.rs
diff --git a/third_party/rust/packed_simd_2/src/api/reductions/min_max.rs b/third_party/rust/packed_simd/src/api/reductions/min_max.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/reductions/min_max.rs
rename to third_party/rust/packed_simd/src/api/reductions/min_max.rs
diff --git a/third_party/rust/packed_simd_2/src/api/select.rs b/third_party/rust/packed_simd/src/api/select.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/select.rs
rename to third_party/rust/packed_simd/src/api/select.rs
diff --git a/third_party/rust/packed_simd_2/src/api/shuffle.rs b/third_party/rust/packed_simd/src/api/shuffle.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/src/api/shuffle.rs
rename to third_party/rust/packed_simd/src/api/shuffle.rs
index fda29ccddc18..1c17bd766e6d 100644
--- a/third_party/rust/packed_simd_2/src/api/shuffle.rs
+++ b/third_party/rust/packed_simd/src/api/shuffle.rs
@@ -27,29 +27,29 @@
 /// Shuffling elements of two vectors:
 ///
 /// ```
-/// # use packed_simd_2::*;
+/// # use packed_simd::*;
 /// # fn main() {
 /// // Shuffle allows reordering the elements:
 /// let x = i32x4::new(1, 2, 3, 4);
 /// let y = i32x4::new(5, 6, 7, 8);
 /// let r = shuffle!(x, y, [4, 0, 5, 1]);
 /// assert_eq!(r, i32x4::new(5, 1, 6, 2));
 ///
 /// // The resulting vector can als be smaller than the input:
 /// let r = shuffle!(x, y, [1, 6]);
 /// assert_eq!(r, i32x2::new(2, 7));
 ///
 /// // Or larger:
 /// let r = shuffle!(x, y, [1, 3, 4, 2, 1, 7, 2, 2]);
 /// assert_eq!(r, i32x8::new(2, 4, 5, 3, 2, 8, 3, 3));
 /// // At most 2 * the number of lanes in the input vector.
 /// # }
 /// ```
 ///
 /// Shuffling elements of one vector:
 ///
 /// ```
-/// # use packed_simd_2::*;
+/// # use packed_simd::*;
 /// # fn main() {
 /// // Shuffle allows reordering the elements of a vector:
 /// let x = i32x4::new(1, 2, 3, 4);
diff --git a/third_party/rust/packed_simd_2/src/api/shuffle1_dyn.rs b/third_party/rust/packed_simd/src/api/shuffle1_dyn.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/shuffle1_dyn.rs
rename to third_party/rust/packed_simd/src/api/shuffle1_dyn.rs
diff --git a/third_party/rust/packed_simd_2/src/api/slice.rs b/third_party/rust/packed_simd/src/api/slice.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/api/slice.rs
rename to third_party/rust/packed_simd/src/api/slice.rs
diff --git a/third_party/rust/packed_simd_2/src/api/slice/from_slice.rs b/third_party/rust/packed_simd/src/api/slice/from_slice.rs
similarity index 97%
rename from third_party/rust/packed_simd_2/src/api/slice/from_slice.rs
rename to third_party/rust/packed_simd/src/api/slice/from_slice.rs
index 50f3914f7bbe..cafd6f8213b1 100644
--- a/third_party/rust/packed_simd_2/src/api/slice/from_slice.rs
+++ b/third_party/rust/packed_simd/src/api/slice/from_slice.rs
@@ -13,7 +13,7 @@ macro_rules! impl_slice_from_slice {
             pub fn from_slice_aligned(slice: &[$elem_ty]) -> Self {
                 unsafe {
                     assert!(slice.len() >= $elem_count);
-                    let target_ptr = slice.get_unchecked(0) as *const $elem_ty;
+                    let target_ptr = slice.as_ptr();
                     assert_eq!(target_ptr.align_offset(crate::mem::align_of::<Self>()), 0);
                     Self::from_slice_aligned_unchecked(slice)
                 }
@@ -41,23 +41,23 @@ macro_rules! impl_slice_from_slice {
             #[inline]
             pub unsafe fn from_slice_aligned_unchecked(slice: &[$elem_ty]) -> Self {
                 debug_assert!(slice.len() >= $elem_count);
-                let target_ptr = slice.get_unchecked(0) as *const $elem_ty;
+                let target_ptr = slice.as_ptr();
                 debug_assert_eq!(target_ptr.align_offset(crate::mem::align_of::<Self>()), 0);
 
                 #[allow(clippy::cast_ptr_alignment)]
                 *(target_ptr as *const Self)
             }
 
             /// Instantiates a new vector with the values of the `slice`.
             ///
             /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
             pub unsafe fn from_slice_unaligned_unchecked(slice: &[$elem_ty]) -> Self {
                 use crate::mem::size_of;
                 debug_assert!(slice.len() >= $elem_count);
-                let target_ptr = slice.get_unchecked(0) as *const $elem_ty as *const u8;
+                let target_ptr = slice.as_ptr().cast();
                 let mut x = Self::splat(0 as $elem_ty);
                 let self_ptr = &mut x as *mut Self as *mut u8;
                 crate::ptr::copy_nonoverlapping(target_ptr, self_ptr, size_of::<Self>());
diff --git a/third_party/rust/packed_simd_2/src/api/slice/write_to_slice.rs b/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
similarity index 97%
rename from third_party/rust/packed_simd_2/src/api/slice/write_to_slice.rs
rename to third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
index dd04a2634d90..5abd4916e026 100644
--- a/third_party/rust/packed_simd_2/src/api/slice/write_to_slice.rs
+++ b/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
@@ -13,7 +13,7 @@ macro_rules! impl_slice_write_to_slice {
             pub fn write_to_slice_aligned(self, slice: &mut [$elem_ty]) {
                 unsafe {
                     assert!(slice.len() >= $elem_count);
-                    let target_ptr = slice.get_unchecked_mut(0) as *mut $elem_ty;
+                    let target_ptr = slice.as_mut_ptr();
                     assert_eq!(target_ptr.align_offset(crate::mem::align_of::<Self>()), 0);
                     self.write_to_slice_aligned_unchecked(slice);
                 }
@@ -42,25 +42,25 @@ macro_rules! impl_slice_write_to_slice {
             #[inline]
             pub unsafe fn write_to_slice_aligned_unchecked(self, slice: &mut [$elem_ty]) {
                 debug_assert!(slice.len() >= $elem_count);
-                let target_ptr = slice.get_unchecked_mut(0) as *mut $elem_ty;
+                let target_ptr = slice.as_mut_ptr();
                 debug_assert_eq!(target_ptr.align_offset(crate::mem::align_of::<Self>()), 0);
 
                 #[allow(clippy::cast_ptr_alignment)]
                 #[allow(clippy::cast_ptr_alignment)]
                 #[allow(clippy::cast_ptr_alignment)]
                 #[allow(clippy::cast_ptr_alignment)]
                 *(target_ptr as *mut Self) = self;
             }
 
             /// Writes the values of the vector to the `slice`.
             ///
             /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
             pub unsafe fn write_to_slice_unaligned_unchecked(self, slice: &mut [$elem_ty]) {
                 debug_assert!(slice.len() >= $elem_count);
-                let target_ptr = slice.get_unchecked_mut(0) as *mut $elem_ty as *mut u8;
+                let target_ptr = slice.as_mut_ptr().cast();
                 let self_ptr = &self as *const Self as *const u8;
                 crate::ptr::copy_nonoverlapping(self_ptr, target_ptr, crate::mem::size_of::<Self>());
             }
diff --git a/third_party/rust/packed_simd_2/src/api/swap_bytes.rs b/third_party/rust/packed_simd/src/api/swap_bytes.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/src/api/swap_bytes.rs
rename to third_party/rust/packed_simd/src/api/swap_bytes.rs
index 53bba25bd311..4649ed679b9d 100644
--- a/third_party/rust/packed_simd_2/src/api/swap_bytes.rs
+++ b/third_party/rust/packed_simd/src/api/swap_bytes.rs
@@ -76,7 +76,7 @@ macro_rules! impl_swap_bytes {
 
         test_if! {
             $test_tt:
-            paste::item_with_macros! {
+            paste::item! {
                 pub mod [<$id _swap_bytes>] {
                     use super::*;
 
diff --git a/third_party/rust/packed_simd_2/src/codegen.rs b/third_party/rust/packed_simd/src/codegen.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen.rs
rename to third_party/rust/packed_simd/src/codegen.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs b/third_party/rust/packed_simd/src/codegen/bit_manip.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/bit_manip.rs
rename to third_party/rust/packed_simd/src/codegen/bit_manip.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/llvm.rs b/third_party/rust/packed_simd/src/codegen/llvm.rs
similarity index 85%
rename from third_party/rust/packed_simd_2/src/codegen/llvm.rs
rename to third_party/rust/packed_simd/src/codegen/llvm.rs
index b4c09849bc4a..bb482fac6625 100644
--- a/third_party/rust/packed_simd_2/src/codegen/llvm.rs
+++ b/third_party/rust/packed_simd/src/codegen/llvm.rs
@@ -5,74 +5,68 @@ use crate::sealed::Shuffle;
 #[allow(unused_imports)] // FIXME: spurious warning?
 use crate::sealed::Simd;
 
-// Shuffle intrinsics: expanded in users' crates, therefore public.
 extern "platform-intrinsic" {
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector2<const IDX: [u32; 2], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
 {
-    simd_shuffle2(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector4<const IDX: [u32; 4], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
 {
-    simd_shuffle4(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector8<const IDX: [u32; 8], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
 {
-    simd_shuffle8(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector16<const IDX: [u32; 16], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
 {
-    simd_shuffle16(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector32<const IDX: [u32; 32], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
 {
-    simd_shuffle32(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
 #[inline]
 pub unsafe fn __shuffle_vector64<const IDX: [u32; 64], T, U>(x: T, y: T) -> U
 where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
 {
-    simd_shuffle64(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 extern "platform-intrinsic" {
diff --git a/third_party/rust/packed_simd_2/src/codegen/math.rs b/third_party/rust/packed_simd/src/codegen/math.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math.rs
rename to third_party/rust/packed_simd/src/codegen/math.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float.rs b/third_party/rust/packed_simd/src/codegen/math/float.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float.rs
rename to third_party/rust/packed_simd/src/codegen/math/float.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs b/third_party/rust/packed_simd/src/codegen/math/float/abs.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/abs.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs b/third_party/rust/packed_simd/src/codegen/math/float/cos.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/cos.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs b/third_party/rust/packed_simd/src/codegen/math/float/cos_pi.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/cos_pi.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs b/third_party/rust/packed_simd/src/codegen/math/float/exp.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/exp.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs b/third_party/rust/packed_simd/src/codegen/math/float/ln.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/ln.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/macros.rs b/third_party/rust/packed_simd/src/codegen/math/float/macros.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/macros.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/macros.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs b/third_party/rust/packed_simd/src/codegen/math/float/mul_add.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/mul_add.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs b/third_party/rust/packed_simd/src/codegen/math/float/mul_adde.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/mul_adde.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs b/third_party/rust/packed_simd/src/codegen/math/float/powf.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/powf.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs b/third_party/rust/packed_simd/src/codegen/math/float/sin.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/sin.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs b/third_party/rust/packed_simd/src/codegen/math/float/sin_cos_pi.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/sin_cos_pi.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs b/third_party/rust/packed_simd/src/codegen/math/float/sin_pi.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/sin_pi.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs b/third_party/rust/packed_simd/src/codegen/math/float/sqrt.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/sqrt.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs b/third_party/rust/packed_simd/src/codegen/math/float/sqrte.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs
rename to third_party/rust/packed_simd/src/codegen/math/float/sqrte.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs b/third_party/rust/packed_simd/src/codegen/pointer_sized_int.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs
rename to third_party/rust/packed_simd/src/codegen/pointer_sized_int.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions.rs b/third_party/rust/packed_simd/src/codegen/reductions.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions.rs
rename to third_party/rust/packed_simd/src/codegen/reductions.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/aarch64.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/aarch64.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/aarch64.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/aarch64.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/arm.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/arm.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/arm.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/arm.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/fallback.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/fallback.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/fallback.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/fallback.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/fallback_impl.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/fallback_impl.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/fallback_impl.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/fallback_impl.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/avx.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/avx.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/avx.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/x86/avx.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/avx2.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/avx2.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/avx2.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/x86/avx2.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/sse.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/sse.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/sse2.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse2.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/reductions/mask/x86/sse2.rs
rename to third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse2.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/shuffle.rs b/third_party/rust/packed_simd/src/codegen/shuffle.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/shuffle.rs
rename to third_party/rust/packed_simd/src/codegen/shuffle.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/shuffle1_dyn.rs b/third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/shuffle1_dyn.rs
rename to third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs b/third_party/rust/packed_simd/src/codegen/swap_bytes.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs
rename to third_party/rust/packed_simd/src/codegen/swap_bytes.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v128.rs b/third_party/rust/packed_simd/src/codegen/v128.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v128.rs
rename to third_party/rust/packed_simd/src/codegen/v128.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v16.rs b/third_party/rust/packed_simd/src/codegen/v16.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v16.rs
rename to third_party/rust/packed_simd/src/codegen/v16.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v256.rs b/third_party/rust/packed_simd/src/codegen/v256.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v256.rs
rename to third_party/rust/packed_simd/src/codegen/v256.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v32.rs b/third_party/rust/packed_simd/src/codegen/v32.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v32.rs
rename to third_party/rust/packed_simd/src/codegen/v32.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v512.rs b/third_party/rust/packed_simd/src/codegen/v512.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v512.rs
rename to third_party/rust/packed_simd/src/codegen/v512.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/v64.rs b/third_party/rust/packed_simd/src/codegen/v64.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/v64.rs
rename to third_party/rust/packed_simd/src/codegen/v64.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/vPtr.rs b/third_party/rust/packed_simd/src/codegen/vPtr.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/vPtr.rs
rename to third_party/rust/packed_simd/src/codegen/vPtr.rs
diff --git a/third_party/rust/packed_simd_2/src/codegen/vSize.rs b/third_party/rust/packed_simd/src/codegen/vSize.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/codegen/vSize.rs
rename to third_party/rust/packed_simd/src/codegen/vSize.rs
diff --git a/third_party/rust/packed_simd_2/src/lib.rs b/third_party/rust/packed_simd/src/lib.rs
similarity index 98%
rename from third_party/rust/packed_simd_2/src/lib.rs
rename to third_party/rust/packed_simd/src/lib.rs
index 277cc818b0c7..867cc10e9eb6 100644
--- a/third_party/rust/packed_simd_2/src/lib.rs
+++ b/third_party/rust/packed_simd/src/lib.rs
@@ -26,28 +26,28 @@
 //! are applied to each vector lane in isolation of the others:
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! let a = i32x4::new(1, 2, 3, 4);
 //! let b = i32x4::new(5, 6, 7, 8);
 //! assert_eq!(a + b, i32x4::new(6, 8, 10, 12));
 //! ```
 //!
 //! Many "horizontal" operations are also provided:
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! # let a = i32x4::new(1, 2, 3, 4);
 //! assert_eq!(a.wrapping_sum(), 10);
 //! ```
 //!
 //! In virtually all architectures vertical operations are fast, while
 //! horizontal operations are, by comparison, much slower. That is, the
 //! most portably-efficient way of performing a reduction over a slice
 //! is to collect the results into a vector using vertical operations,
 //! and performing a single horizontal operation at the end:
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! fn reduce(x: &[i32]) -> i32 {
 //!     assert_eq!(x.len() % 4, 0);
 //!     let mut sum = i32x4::splat(0); // [0, 0, 0, 0]
@@ -79,7 +79,7 @@
 //! ## Basic operations
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! // Sets all elements to `0`:
 //! let a = i32x4::splat(0);
 //!
@@ -107,7 +107,7 @@
 //! to be performed:
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! let a = i32x4::new(1, 1, 2, 2);
 //!
 //! // Add `1` to the first two lanes of the vector.
@@ -140,7 +140,7 @@
 //! All vertical comparison operations returns masks:
 //!
 //! ```
-//! # use packed_simd_2::*;
+//! # use packed_simd::*;
 //! let a = i32x4::new(1, 1, 3, 3);
 //! let b = i32x4::new(2, 2, 0, 0);
 //!
@@ -241,6 +241,7 @@
         clippy::from_over_into,
 )]
 #![cfg_attr(test, feature(hashmap_internals))]
+#![cfg_attr(doc_cfg, feature(doc_cfg))]
 #![deny(rust_2018_idioms, clippy::missing_inline_in_public_items)]
 #![no_std]
 
@@ -279,7 +280,7 @@ pub use crate::sealed::{Mask, Shuffle, Simd as SimdVector, SimdArray};
 /// # Examples
 ///
 /// ```
-/// # use packed_simd_2::Simd;
+/// # use packed_simd::Simd;
 /// let v = Simd::<[i32; 4]>::new(0, 1, 2, 3);
 /// assert_eq!(v.extract(2), 2);
 /// ```
diff --git a/third_party/rust/packed_simd_2/src/masks.rs b/third_party/rust/packed_simd/src/masks.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/masks.rs
rename to third_party/rust/packed_simd/src/masks.rs
diff --git a/third_party/rust/packed_simd_2/src/sealed.rs b/third_party/rust/packed_simd/src/sealed.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/sealed.rs
rename to third_party/rust/packed_simd/src/sealed.rs
diff --git a/third_party/rust/packed_simd_2/src/testing.rs b/third_party/rust/packed_simd/src/testing.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/testing.rs
rename to third_party/rust/packed_simd/src/testing.rs
diff --git a/third_party/rust/packed_simd_2/src/testing/macros.rs b/third_party/rust/packed_simd/src/testing/macros.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/testing/macros.rs
rename to third_party/rust/packed_simd/src/testing/macros.rs
diff --git a/third_party/rust/packed_simd_2/src/testing/utils.rs b/third_party/rust/packed_simd/src/testing/utils.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/testing/utils.rs
rename to third_party/rust/packed_simd/src/testing/utils.rs
diff --git a/third_party/rust/packed_simd_2/src/v128.rs b/third_party/rust/packed_simd/src/v128.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v128.rs
rename to third_party/rust/packed_simd/src/v128.rs
diff --git a/third_party/rust/packed_simd_2/src/v16.rs b/third_party/rust/packed_simd/src/v16.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v16.rs
rename to third_party/rust/packed_simd/src/v16.rs
diff --git a/third_party/rust/packed_simd_2/src/v256.rs b/third_party/rust/packed_simd/src/v256.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v256.rs
rename to third_party/rust/packed_simd/src/v256.rs
diff --git a/third_party/rust/packed_simd_2/src/v32.rs b/third_party/rust/packed_simd/src/v32.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v32.rs
rename to third_party/rust/packed_simd/src/v32.rs
diff --git a/third_party/rust/packed_simd_2/src/v512.rs b/third_party/rust/packed_simd/src/v512.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v512.rs
rename to third_party/rust/packed_simd/src/v512.rs
diff --git a/third_party/rust/packed_simd_2/src/v64.rs b/third_party/rust/packed_simd/src/v64.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/v64.rs
rename to third_party/rust/packed_simd/src/v64.rs
diff --git a/third_party/rust/packed_simd_2/src/vPtr.rs b/third_party/rust/packed_simd/src/vPtr.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/vPtr.rs
rename to third_party/rust/packed_simd/src/vPtr.rs
diff --git a/third_party/rust/packed_simd_2/src/vSize.rs b/third_party/rust/packed_simd/src/vSize.rs
similarity index 100%
rename from third_party/rust/packed_simd_2/src/vSize.rs
rename to third_party/rust/packed_simd/src/vSize.rs
diff --git a/third_party/rust/packed_simd_2/tests/endianness.rs b/third_party/rust/packed_simd/tests/endianness.rs
similarity index 99%
rename from third_party/rust/packed_simd_2/tests/endianness.rs
rename to third_party/rust/packed_simd/tests/endianness.rs
index da12c2338b1f..17a7796b1bf8 100644
--- a/third_party/rust/packed_simd_2/tests/endianness.rs
+++ b/third_party/rust/packed_simd/tests/endianness.rs
@@ -1,7 +1,7 @@
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen_test::*;
 
-use packed_simd_2::*;
+use packed_simd::*;
 use std::{mem, slice};
 
 #[cfg_attr(not(target_arch = "wasm32"), test)]
diff --git a/third_party/rust/packed_simd_2/.cargo-checksum.json b/third_party/rust/packed_simd_2/.cargo-checksum.json
deleted file mode 100644
index d74b2014632a..000000000000
--- a/third_party/rust/packed_simd_2/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"30a61a5ec53355fc1f3585e1690280308c2b7961701abc11e8389b235b647178","Cargo.toml":"c630c676e8c9564fff731f051a57a3a51f018fb35f4bd606f7c4677109239ae6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"fa4dd64f66972217d35b7653338c9e2011ccd8f3008ae7c0103272d4287f9b1d","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"019ed29c43989782d8eec3a961654cfc172d7a7898da4eca8f654700af7e1988","ci/all.sh":"2ae6b2445b4db83833e40b37efd0016c6b9879ee988b9b3ef94db5439a3e1606","ci/android-install-ndk.sh":"0f1746108cc30bf9b9ba45bcde7b19fc1a8bdf5b0258035b4eb8dc69b75efac4","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"da88c0d50f16dc08448c7fdf1fa5ed2cbe576acf9e7dd85b5b818621b2a8c702","ci/docker/arm-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"bb5f8ae890707c128652290ffc544447643bf12037ddd73c6ad6989f848cb380","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"1afaefcbc05b740859acd4e067bc92439be6bcbe8f2e9678474fb434bcd398d9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"8282ea707a94109beed47a57574755e2d58401735904a03f85fb64c578c53b4f","ci/docker/i586-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/i686-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/mips-unknown-linux-gnu/Dockerfile":"b2ebc25797612c4f8395fe9d407725156044955bfbcf442036b7f55b43a5f9da","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"b0c1692ac65bc56dd30494b1993d8e929c48cc9c4b92029b7c7592af6d4f9220","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"4e9249c179300138141d0b2b7401b11897f64aed69f541f078c1db4594df2827","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"3164c52b0dcbb01afa78292b15b5c43503ccf0491cf6eb801ec2bf22ae274e52","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"786f799d0b56eb54d7b6c4b00e1aed4ce81776e14e44767e083c89d014b72004","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e8bc363837cd9c2d8b22402acb8c1c329efc11ba5d12170603d2fe2eae9da059","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"47998d45b781d797b9e6085ebe898d90de0c952b54537a8db4e8d7503eb032d9","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"93fb44df3d7fd31ead158570667c97b5076a05c3d968af4a84bc13819a8f2db8","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"da1c39a3ff1fe22e41395fa7c8934e90b4c1788e551b9aec6e38bfd94effc437","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"51955a8bf3c4d440f47382af6f5426ebff94ab01a04da36175babda9a057740f","ci/docker/wasm32-unknown-unknown/Dockerfile":"5a022299f56730cf8c432a07391e95e199cfa36dc8da2a96c9d185c8de93e913","ci/docker/x86_64-linux-android/Dockerfile":"685040273cf350d5509e580ac451555efa19790c8723ca2af066adadc6880ad2","ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile":"44b6203d9290bfdc53d81219f0937e1110847a23dd982ec8c4de388354f01536","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"7f4e3ca5fa288ea70edb4d1f75309708cd30b192e2e4444e61c4d5b3b58f89cf","ci/dox.sh":"434e9611c52e389312d2b03564adf09429f10cc76fe66a8644adb104903b87b7","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab
\ No newline at end of file
diff --git a/third_party/rust/packed_simd_2/ci/android-install-ndk.sh b/third_party/rust/packed_simd_2/ci/android-install-ndk.sh
deleted file mode 100644
index 818e78446ae8..000000000000
--- a/third_party/rust/packed_simd_2/ci/android-install-ndk.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
-
-curl --retry 5 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
-unzip -q android-ndk-r15b-linux-x86_64.zip
-
-case "$1" in
-    aarch64)
-        arch=arm64
-        ;;
-
-    i686)
-        arch=x86
-        ;;
-
-    *)
-        arch=$1
-        ;;
-esac;
-
-android-ndk-r15b/build/tools/make_standalone_toolchain.py \
-    --unified-headers \
-    --install-dir "/android/ndk-${1}" \
-    --arch "${arch}" \
-    --api 24
-
-rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b