From a86b4321141b2557e1062ba3320f8c3343860ac4 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Wed, 12 Feb 2025 07:32:50 -0500
Subject: [PATCH 1/2] Publically re-export rand

---
 arrow/src/util/bench_util.rs | 16 ++++++++--------
 arrow/src/util/data_gen.rs   |  2 +-
 arrow/src/util/mod.rs        |  3 +++
 arrow/src/util/test_util.rs  |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/arrow/src/util/bench_util.rs b/arrow/src/util/bench_util.rs
index 387d9b973a9c..a903c50b94de 100644
--- a/arrow/src/util/bench_util.rs
+++ b/arrow/src/util/bench_util.rs
@@ -19,17 +19,17 @@
 
 use crate::array::*;
 use crate::datatypes::*;
-use crate::util::test_util::seedable_rng;
-use arrow_buffer::{Buffer, IntervalMonthDayNano};
-use half::f16;
-use rand::distr::uniform::SampleUniform;
-use rand::rng;
-use rand::Rng;
-use rand::SeedableRng;
-use rand::{
+use crate::util::rand::distr::uniform::SampleUniform;
+use crate::util::rand::rng;
+use crate::util::rand::Rng;
+use crate::util::rand::SeedableRng;
+use crate::util::rand::{
     distr::{Alphanumeric, Distribution, StandardUniform},
     prelude::StdRng,
 };
+use crate::util::test_util::seedable_rng;
+use arrow_buffer::{Buffer, IntervalMonthDayNano};
+use half::f16;
 use std::ops::Range;
 
 /// Creates an random (but fixed-seeded) array of a given size and null density
diff --git a/arrow/src/util/data_gen.rs b/arrow/src/util/data_gen.rs
index ee5350363289..1d4b115efd9b 100644
--- a/arrow/src/util/data_gen.rs
+++ b/arrow/src/util/data_gen.rs
@@ -19,7 +19,7 @@
 
 use std::sync::Arc;
 
-use rand::{
+use crate::util::rand::{
     distr::uniform::{SampleRange, SampleUniform},
     Rng,
 };
diff --git a/arrow/src/util/mod.rs b/arrow/src/util/mod.rs
index 2c131669b73e..c46dff0ffcad 100644
--- a/arrow/src/util/mod.rs
+++ b/arrow/src/util/mod.rs
@@ -30,5 +30,8 @@ pub use arrow_cast::pretty;
 pub mod string_writer;
 #[cfg(any(test, feature = "test_utils"))]
 pub mod test_util;
+/// Public re-export rand crate as it appears in the public API
+#[cfg(feature = "test_utils")]
+pub use rand;
 
 pub use arrow_cast::display;
diff --git a/arrow/src/util/test_util.rs b/arrow/src/util/test_util.rs
index 566ccc6ab536..a08f73d06cba 100644
--- a/arrow/src/util/test_util.rs
+++ b/arrow/src/util/test_util.rs
@@ -17,7 +17,7 @@
 
 //! Utils to make testing easier
 
-use rand::{rngs::StdRng, Rng, SeedableRng};
+use crate::util::rand::{rngs::StdRng, Rng, SeedableRng};
 use std::{env, error::Error, fs, io::Write, path::PathBuf};
 
 /// Returns a vector of size `n`, filled with randomly generated bytes.

From 10e0493b403a545ec18fd551e915b04bd01556f4 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Wed, 12 Feb 2025 08:55:44 -0500
Subject: [PATCH 2/2] adjust gate

---
 arrow/src/util/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arrow/src/util/mod.rs b/arrow/src/util/mod.rs
index c46dff0ffcad..84f65c163d44 100644
--- a/arrow/src/util/mod.rs
+++ b/arrow/src/util/mod.rs
@@ -31,7 +31,7 @@ pub mod string_writer;
 #[cfg(any(test, feature = "test_utils"))]
 pub mod test_util;
 /// Public re-export rand crate as it appears in the public API
-#[cfg(feature = "test_utils")]
+#[cfg(any(test, feature = "test_utils"))]
 pub use rand;
 
 pub use arrow_cast::display;