From 7bf2975e52a5856d20c4d0ea5c06aa2b0e7e9d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Horstmann?= <git@jhorstmann.net>
Date: Sun, 6 Aug 2023 11:24:06 +0200
Subject: [PATCH 1/2] Update packed_simd and run miri tests on simd code

---
 .github/workflows/miri.sh | 8 +++-----
 arrow-array/Cargo.toml    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/miri.sh b/.github/workflows/miri.sh
index 3323bd0996bf..faf9f028d281 100755
--- a/.github/workflows/miri.sh
+++ b/.github/workflows/miri.sh
@@ -5,11 +5,7 @@
 # Must be run with nightly rust for example
 # rustup default nightly
 
-
-# stacked borrows checking uses too much memory to run successfully in github actions
-# re-enable if the CI is migrated to something more powerful (https://github.com/apache/arrow-rs/issues/1833)
-# see also https://github.com/rust-lang/miri/issues/1367
-export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-disable-stacked-borrows"
+export MIRIFLAGS="-Zmiri-disable-isolation"
 cargo miri setup
 cargo clean
 
@@ -18,3 +14,5 @@ cargo miri test -p arrow-buffer
 cargo miri test -p arrow-data --features ffi
 cargo miri test -p arrow-schema --features ffi
 cargo miri test -p arrow-array
+cargo miri test -p arrow-arith --features simd
+cargo miri test -p arrow-ord --features simd
diff --git a/arrow-array/Cargo.toml b/arrow-array/Cargo.toml
index 4236da6d656b..80a6eb3f541e 100644
--- a/arrow-array/Cargo.toml
+++ b/arrow-array/Cargo.toml
@@ -49,7 +49,7 @@ chrono-tz = { version = "0.8", optional = true }
 num = { version = "0.4.1", default-features = false, features = ["std"] }
 half = { version = "2.1", default-features = false, features = ["num-traits"] }
 hashbrown = { version = "0.14", default-features = false }
-packed_simd = { version = "0.3", default-features = false, optional = true, package = "packed_simd_2" }
+packed_simd = { version = "0.3.9", default-features = false, optional = true }
 
 [features]
 simd = ["packed_simd"]

From 5113c6504bc5ef98fb14d08f7c729c5aca66858b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Horstmann?= <git@jhorstmann.net>
Date: Sun, 6 Aug 2023 11:36:51 +0200
Subject: [PATCH 2/2] Unpin nightly version

---
 .github/workflows/arrow.yml | 6 ++----
 .github/workflows/docs.yml  | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml
index 4872b66077f6..279e276a7912 100644
--- a/.github/workflows/arrow.yml
+++ b/.github/workflows/arrow.yml
@@ -142,8 +142,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          # Pinned nightly (#4651)
-          rust-version: nightly-2023-08-03
+          rust-version: nightly
       - name: Test arrow-array with SIMD
         run: cargo test -p arrow-array --features simd
       - name: Test arrow-ord with SIMD
@@ -169,8 +168,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          # Pinned nightly (#4651)
-          rust-version: nightly-2023-08-03
+          rust-version: nightly
           target: wasm32-unknown-unknown,wasm32-wasi
       - name: Build wasm32-unknown-unknown
         run: cargo build -p arrow --no-default-features --features=json,csv,ipc,simd,ffi --target wasm32-unknown-unknown
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2bdfeea2471e..4ca71f464591 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -37,8 +37,7 @@ jobs:
     strategy:
       matrix:
         arch: [ amd64 ]
-        # Pinned nightly (#4651)
-        rust: [ nightly-2023-08-03 ]
+        rust: [ nightly ]
     container:
       image: ${{ matrix.arch }}/rust
       env: