Skip to content

Commit 49d76cd

Browse files
rename extract to extract_lane (#1586)
- [x] Added a `CHANGELOG.md` entry # Summary Rename a function which is only used for testing because it clashes with `std::simd` # Motivation CI fails otherwise # Details
1 parent e0a70fd commit 49d76cd

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ A [separate changelog is kept for rand_core](rand_core/CHANGELOG.md).
88

99
You may also find the [Upgrade Guide](https://rust-random.github.io/book/update.html) useful.
1010

11+
## [Unreleased]
12+
- Fix feature `simd_support` for recent nightly rust (#1586)
13+
1114
## [0.9.0] - 2025-01-27
1215
### Security and unsafe
1316
- Policy: "rand is not a crypto library" (#1514)

src/distr/uniform_float.rs

+16-13
Original file line numberDiff line numberDiff line change
@@ -248,39 +248,42 @@ mod tests {
248248
let my_uniform = Uniform::new(low, high).unwrap();
249249
let my_incl_uniform = Uniform::new_inclusive(low, high).unwrap();
250250
for _ in 0..100 {
251-
let v = rng.sample(my_uniform).extract(lane);
251+
let v = rng.sample(my_uniform).extract_lane(lane);
252252
assert!(low_scalar <= v && v <= high_scalar);
253-
let v = rng.sample(my_incl_uniform).extract(lane);
253+
let v = rng.sample(my_incl_uniform).extract_lane(lane);
254254
assert!(low_scalar <= v && v <= high_scalar);
255255
let v =
256256
<$ty as SampleUniform>::Sampler::sample_single(low, high, &mut rng)
257257
.unwrap()
258-
.extract(lane);
258+
.extract_lane(lane);
259259
assert!(low_scalar <= v && v <= high_scalar);
260260
let v = <$ty as SampleUniform>::Sampler::sample_single_inclusive(
261261
low, high, &mut rng,
262262
)
263263
.unwrap()
264-
.extract(lane);
264+
.extract_lane(lane);
265265
assert!(low_scalar <= v && v <= high_scalar);
266266
}
267267

268268
assert_eq!(
269269
rng.sample(Uniform::new_inclusive(low, low).unwrap())
270-
.extract(lane),
270+
.extract_lane(lane),
271271
low_scalar
272272
);
273273

274-
assert_eq!(zero_rng.sample(my_uniform).extract(lane), low_scalar);
275-
assert_eq!(zero_rng.sample(my_incl_uniform).extract(lane), low_scalar);
274+
assert_eq!(zero_rng.sample(my_uniform).extract_lane(lane), low_scalar);
275+
assert_eq!(
276+
zero_rng.sample(my_incl_uniform).extract_lane(lane),
277+
low_scalar
278+
);
276279
assert_eq!(
277280
<$ty as SampleUniform>::Sampler::sample_single(
278281
low,
279282
high,
280283
&mut zero_rng
281284
)
282285
.unwrap()
283-
.extract(lane),
286+
.extract_lane(lane),
284287
low_scalar
285288
);
286289
assert_eq!(
@@ -290,12 +293,12 @@ mod tests {
290293
&mut zero_rng
291294
)
292295
.unwrap()
293-
.extract(lane),
296+
.extract_lane(lane),
294297
low_scalar
295298
);
296299

297-
assert!(max_rng.sample(my_uniform).extract(lane) <= high_scalar);
298-
assert!(max_rng.sample(my_incl_uniform).extract(lane) <= high_scalar);
300+
assert!(max_rng.sample(my_uniform).extract_lane(lane) <= high_scalar);
301+
assert!(max_rng.sample(my_incl_uniform).extract_lane(lane) <= high_scalar);
299302
// sample_single cannot cope with max_rng:
300303
// assert!(<$ty as SampleUniform>::Sampler
301304
// ::sample_single(low, high, &mut max_rng).unwrap()
@@ -307,7 +310,7 @@ mod tests {
307310
&mut max_rng
308311
)
309312
.unwrap()
310-
.extract(lane)
313+
.extract_lane(lane)
311314
<= high_scalar
312315
);
313316

@@ -326,7 +329,7 @@ mod tests {
326329
&mut lowering_max_rng
327330
)
328331
.unwrap()
329-
.extract(lane)
332+
.extract_lane(lane)
330333
<= high_scalar
331334
);
332335
}

src/distr/utils.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ pub(crate) trait FloatSIMDScalarUtils: FloatSIMDUtils {
236236
type Scalar;
237237

238238
fn replace(self, index: usize, new_value: Self::Scalar) -> Self;
239-
fn extract(self, index: usize) -> Self::Scalar;
239+
fn extract_lane(self, index: usize) -> Self::Scalar;
240240
}
241241

242242
/// Implement functions on f32/f64 to give them APIs similar to SIMD types
@@ -320,7 +320,7 @@ macro_rules! scalar_float_impl {
320320
}
321321

322322
#[inline]
323-
fn extract(self, index: usize) -> Self::Scalar {
323+
fn extract_lane(self, index: usize) -> Self::Scalar {
324324
debug_assert_eq!(index, 0);
325325
self
326326
}
@@ -395,7 +395,7 @@ macro_rules! simd_impl {
395395
}
396396

397397
#[inline]
398-
fn extract(self, index: usize) -> Self::Scalar {
398+
fn extract_lane(self, index: usize) -> Self::Scalar {
399399
self.as_array()[index]
400400
}
401401
}

0 commit comments

Comments
 (0)