Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ unbiased = []
# Deprecated option: enable logging
log = []

# Support the std::range types stabilised in Rust 1.96.0.
rust_1_96 = []

[dependencies]
rand_core = { version = "0.10.0", default-features = false }
serde = { version = "1.0.103", features = ["derive"], optional = true }
Expand Down
77 changes: 69 additions & 8 deletions src/distr/uniform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ mod other;
pub use other::{UniformChar, UniformDuration};

use core::fmt;
use core::ops::{Range, RangeInclusive, RangeTo, RangeToInclusive};

use crate::Rng;
use crate::distr::Distribution;
Expand Down Expand Up @@ -371,22 +370,40 @@ pub trait UniformSampler: Sized {
}
}

impl<X: SampleUniform> TryFrom<Range<X>> for Uniform<X> {
impl<X: SampleUniform> TryFrom<::core::ops::Range<X>> for Uniform<X> {
type Error = Error;

fn try_from(r: Range<X>) -> Result<Uniform<X>, Error> {
fn try_from(r: ::core::ops::Range<X>) -> Result<Uniform<X>, Error> {
Uniform::new(r.start, r.end)
}
}

impl<X: SampleUniform> TryFrom<RangeInclusive<X>> for Uniform<X> {
#[cfg(feature = "rust_1_96")]
impl<X: SampleUniform> TryFrom<::core::range::Range<X>> for Uniform<X> {
type Error = Error;

fn try_from(r: ::core::range::Range<X>) -> Result<Uniform<X>, Error> {
Uniform::new(r.start, r.end)
}
}

impl<X: SampleUniform> TryFrom<::core::ops::RangeInclusive<X>> for Uniform<X> {
type Error = Error;

fn try_from(r: ::core::ops::RangeInclusive<X>) -> Result<Uniform<X>, Error> {
Uniform::new_inclusive(r.start(), r.end())
}
}

#[cfg(feature = "rust_1_96")]
impl<X: SampleUniform> TryFrom<::core::range::RangeInclusive<X>> for Uniform<X> {
type Error = Error;

fn try_from(r: ::core::range::RangeInclusive<X>) -> Result<Uniform<X>, Error> {
Uniform::new_inclusive(r.start, r.last)
}
}

/// Helper trait similar to [`Borrow`] but implemented
/// only for [`SampleUniform`] and references to [`SampleUniform`]
/// in order to resolve ambiguity issues.
Expand Down Expand Up @@ -429,7 +446,20 @@ pub trait SampleRange<T> {
fn is_empty(&self) -> bool;
}

impl<T: SampleUniform + PartialOrd> SampleRange<T> for Range<T> {
impl<T: SampleUniform + PartialOrd> SampleRange<T> for ::core::ops::Range<T> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<T, Error> {
T::Sampler::sample_single(self.start, self.end, rng)
}

#[inline]
fn is_empty(&self) -> bool {
!(self.start < self.end)
}
}

#[cfg(feature = "rust_1_96")]
impl<T: SampleUniform + PartialOrd> SampleRange<T> for ::core::range::Range<T> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<T, Error> {
T::Sampler::sample_single(self.start, self.end, rng)
Expand All @@ -441,7 +471,7 @@ impl<T: SampleUniform + PartialOrd> SampleRange<T> for Range<T> {
}
}

impl<T: SampleUniform + PartialOrd> SampleRange<T> for RangeInclusive<T> {
impl<T: SampleUniform + PartialOrd> SampleRange<T> for ::core::ops::RangeInclusive<T> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<T, Error> {
T::Sampler::sample_single_inclusive(self.start(), self.end(), rng)
Expand All @@ -453,9 +483,22 @@ impl<T: SampleUniform + PartialOrd> SampleRange<T> for RangeInclusive<T> {
}
}

#[cfg(feature = "rust_1_96")]
impl<T: SampleUniform + PartialOrd> SampleRange<T> for ::core::range::RangeInclusive<T> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<T, Error> {
T::Sampler::sample_single_inclusive(self.start, self.last, rng)
}

#[inline]
fn is_empty(&self) -> bool {
!(self.start <= self.last)
}
}

macro_rules! impl_sample_range_u {
($t:ty) => {
impl SampleRange<$t> for RangeTo<$t> {
impl SampleRange<$t> for ::core::ops::RangeTo<$t> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<$t, Error> {
<$t as SampleUniform>::Sampler::sample_single(0, self.end, rng)
Expand All @@ -467,7 +510,7 @@ macro_rules! impl_sample_range_u {
}
}

impl SampleRange<$t> for RangeToInclusive<$t> {
impl SampleRange<$t> for ::core::ops::RangeToInclusive<$t> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<$t, Error> {
<$t as SampleUniform>::Sampler::sample_single_inclusive(0, self.end, rng)
Expand All @@ -478,6 +521,24 @@ macro_rules! impl_sample_range_u {
false
}
}

// `core::range::RangeTo` is set to be a re-export of `core::ops::RangeTo`:
// > A Rust version in the near future will also add `core::range::RangeFull` and `core::range::RangeTo`
// as re-exports from `core::ops` (these do not implement `Iterator` and already implement `Copy`)
// Source: https://blog.rust-lang.org/2026/05/28/Rust-1.96.0/#new-range-types
Comment on lines +525 to +528
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It suffices to say that we impl SampleRange<_> for the legacy core::ops::{RangeTo, RangeFull} types for compatibility with our MSRV.

(We will presumably get a deprecation warning when updating the MSRV/edition at some point in the future.)


#[cfg(feature = "rust_1_96")]
impl SampleRange<$t> for ::core::range::RangeToInclusive<$t> {
#[inline]
fn sample_single<R: Rng + ?Sized>(self, rng: &mut R) -> Result<$t, Error> {
<$t as SampleUniform>::Sampler::sample_single_inclusive(0, self.last, rng)
}

#[inline]
fn is_empty(&self) -> bool {
false
}
}
};
}

Expand Down
Loading