diff options
| author | bors <bors@rust-lang.org> | 2024-01-29 08:52:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-29 08:52:13 +0000 |
| commit | fb4bca04fa1bde2f7db1b31a59e066f7bebd7fc6 (patch) | |
| tree | 654f724730ed9a70d2db3ce699bb8545f7ab2cd3 /library/std | |
| parent | 0ea334ab739265168fba366afcdc7ff68c1dec53 (diff) | |
| parent | 021739c84021b996e4d65bbd7956dd3c732c6dc2 (diff) | |
Auto merge of #120165 - reitermarkus:nonzero-switch-alias-direction, r=dtolnay
Switch `NonZero` alias direction. Step 4 mentioned in https://github.com/rust-lang/rust/pull/100428#pullrequestreview-1767139731. Depends on https://github.com/rust-lang/rust/pull/120160. r? `@dtolnay`
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/num.rs | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 751e988a99b..2e458562744 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -323,6 +323,7 @@ #![feature(float_gamma)] #![feature(float_minimum_maximum)] #![feature(float_next_up_down)] +#![feature(generic_nonzero)] #![feature(hasher_prefixfree_extras)] #![feature(hashmap_internals)] #![feature(hint_assert_unchecked)] diff --git a/library/std/src/num.rs b/library/std/src/num.rs index 55f6ddcf77f..1343fdfd1df 100644 --- a/library/std/src/num.rs +++ b/library/std/src/num.rs @@ -16,6 +16,16 @@ pub use core::num::Wrapping; #[stable(feature = "rust1", since = "1.0.0")] pub use core::num::{FpCategory, ParseFloatError, ParseIntError, TryFromIntError}; +#[unstable( + feature = "nonzero_internals", + reason = "implementation detail which may disappear or be replaced at any time", + issue = "none" +)] +pub use core::num::ZeroablePrimitive; + +#[unstable(feature = "generic_nonzero", issue = "120257")] +pub use core::num::NonZero; + #[stable(feature = "signed_nonzero", since = "1.34.0")] pub use core::num::{NonZeroI128, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8, NonZeroIsize}; #[stable(feature = "nonzero", since = "1.28.0")] |