Skip to content

Commit 4c48f5a

Browse files
authored
Rollup merge of #71886 - t-rapp:tr-saturating-funcs, r=dtolnay
Stabilize saturating_abs and saturating_neg Stabilizes the following signed integer functions with saturation mechanics: * saturating_abs() * saturating_neg() Closes #59983
2 parents 914adf0 + f99344a commit 4c48f5a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/libcore/num/mod.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1165,8 +1165,7 @@ instead of overflowing.
11651165
Basic usage:
11661166
11671167
```
1168-
", $Feature, "#![feature(saturating_neg)]
1169-
assert_eq!(100", stringify!($SelfT), ".saturating_neg(), -100);
1168+
", $Feature, "assert_eq!(100", stringify!($SelfT), ".saturating_neg(), -100);
11701169
assert_eq!((-100", stringify!($SelfT), ").saturating_neg(), 100);
11711170
assert_eq!(", stringify!($SelfT), "::MIN.saturating_neg(), ", stringify!($SelfT),
11721171
"::MAX);
@@ -1175,7 +1174,7 @@ assert_eq!(", stringify!($SelfT), "::MAX.saturating_neg(), ", stringify!($SelfT)
11751174
$EndFeature, "
11761175
```"),
11771176

1178-
#[unstable(feature = "saturating_neg", issue = "59983")]
1177+
#[stable(feature = "saturating_neg", since = "1.45.0")]
11791178
#[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
11801179
#[inline]
11811180
pub const fn saturating_neg(self) -> Self {
@@ -1192,8 +1191,7 @@ MIN` instead of overflowing.
11921191
Basic usage:
11931192
11941193
```
1195-
", $Feature, "#![feature(saturating_neg)]
1196-
assert_eq!(100", stringify!($SelfT), ".saturating_abs(), 100);
1194+
", $Feature, "assert_eq!(100", stringify!($SelfT), ".saturating_abs(), 100);
11971195
assert_eq!((-100", stringify!($SelfT), ").saturating_abs(), 100);
11981196
assert_eq!(", stringify!($SelfT), "::MIN.saturating_abs(), ", stringify!($SelfT),
11991197
"::MAX);
@@ -1202,7 +1200,7 @@ assert_eq!((", stringify!($SelfT), "::MIN + 1).saturating_abs(), ", stringify!($
12021200
$EndFeature, "
12031201
```"),
12041202

1205-
#[unstable(feature = "saturating_neg", issue = "59983")]
1203+
#[stable(feature = "saturating_neg", since = "1.45.0")]
12061204
#[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
12071205
#[inline]
12081206
pub const fn saturating_abs(self) -> Self {

src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#![feature(pattern)]
1818
#![feature(range_is_empty)]
1919
#![feature(raw)]
20-
#![feature(saturating_neg)]
2120
#![feature(sort_internals)]
2221
#![feature(slice_partition_at_index)]
2322
#![feature(specialization)]

src/test/ui/consts/const-int-arithmetic.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22

3-
#![feature(saturating_neg)]
43
#![feature(const_checked_int_methods)]
54
#![feature(const_euclidean_int_methods)]
65
#![feature(const_overflowing_int_methods)]

0 commit comments

Comments
 (0)