Skip to content

Commit 8cdb783

Browse files
authored
Rollup merge of rust-lang#131391 - ChaiTRex:isqrt, r=scottmcm,tgross35
Stabilize `isqrt` feature Stabilizes the `isqrt` feature. FCP is incomplete. Closes rust-lang#116226
2 parents 848fcd5 + fcc990d commit 8cdb783

File tree

6 files changed

+8
-15
lines changed

6 files changed

+8
-15
lines changed

core/benches/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#![feature(iter_array_chunks)]
99
#![feature(iter_next_chunk)]
1010
#![feature(iter_advance_by)]
11-
#![feature(isqrt)]
1211

1312
extern crate test;
1413

core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
#![feature(ip)]
151151
#![feature(is_ascii_octdigit)]
152152
#![feature(is_val_statically_known)]
153-
#![feature(isqrt)]
154153
#![feature(lazy_get)]
155154
#![feature(link_cfg)]
156155
#![feature(non_null_from_ref)]

core/src/num/int_macros.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1629,11 +1629,10 @@ macro_rules! int_impl {
16291629
///
16301630
/// Basic usage:
16311631
/// ```
1632-
/// #![feature(isqrt)]
16331632
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".checked_isqrt(), Some(3));")]
16341633
/// ```
1635-
#[unstable(feature = "isqrt", issue = "116226")]
1636-
#[rustc_const_unstable(feature = "isqrt", issue = "116226")]
1634+
#[stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
1635+
#[rustc_const_stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
16371636
#[must_use = "this returns the result of the operation, \
16381637
without modifying the original"]
16391638
#[inline]
@@ -2880,11 +2879,10 @@ macro_rules! int_impl {
28802879
///
28812880
/// Basic usage:
28822881
/// ```
2883-
/// #![feature(isqrt)]
28842882
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".isqrt(), 3);")]
28852883
/// ```
2886-
#[unstable(feature = "isqrt", issue = "116226")]
2887-
#[rustc_const_unstable(feature = "isqrt", issue = "116226")]
2884+
#[stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
2885+
#[rustc_const_stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
28882886
#[must_use = "this returns the result of the operation, \
28892887
without modifying the original"]
28902888
#[inline]

core/src/num/nonzero.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,6 @@ macro_rules! nonzero_integer_signedness_dependent_methods {
15271527
///
15281528
/// Basic usage:
15291529
/// ```
1530-
/// #![feature(isqrt)]
15311530
/// # use std::num::NonZero;
15321531
/// #
15331532
/// # fn main() { test().unwrap(); }
@@ -1539,8 +1538,8 @@ macro_rules! nonzero_integer_signedness_dependent_methods {
15391538
/// # Some(())
15401539
/// # }
15411540
/// ```
1542-
#[unstable(feature = "isqrt", issue = "116226")]
1543-
#[rustc_const_unstable(feature = "isqrt", issue = "116226")]
1541+
#[stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
1542+
#[rustc_const_stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
15441543
#[must_use = "this returns the result of the operation, \
15451544
without modifying the original"]
15461545
#[inline]

core/src/num/uint_macros.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2753,11 +2753,10 @@ macro_rules! uint_impl {
27532753
///
27542754
/// Basic usage:
27552755
/// ```
2756-
/// #![feature(isqrt)]
27572756
#[doc = concat!("assert_eq!(10", stringify!($SelfT), ".isqrt(), 3);")]
27582757
/// ```
2759-
#[unstable(feature = "isqrt", issue = "116226")]
2760-
#[rustc_const_unstable(feature = "isqrt", issue = "116226")]
2758+
#[stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
2759+
#[rustc_const_stable(feature = "isqrt", since = "CURRENT_RUSTC_VERSION")]
27612760
#[must_use = "this returns the result of the operation, \
27622761
without modifying the original"]
27632762
#[inline]

core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#![feature(ip)]
5454
#![feature(ip_from)]
5555
#![feature(is_ascii_octdigit)]
56-
#![feature(isqrt)]
5756
#![feature(iter_advance_by)]
5857
#![feature(iter_array_chunks)]
5958
#![feature(iter_chain)]

0 commit comments

Comments
 (0)