Skip to content

Commit 20bb932

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #89876 - AlexApps99:const_ops, r=oli-obk
Make most std::ops traits const on numeric types This PR makes existing implementations of `std::ops` traits (`Add`, `Sub`, etc) [`impl const`](#67792) where possible. This affects: - All numeric primitives (`u*`, `i*`, `f*`) - `NonZero*` - `Wrapping` This is under the `rustc_const_unstable` feature `const_ops`. I will write tests once I know what can and can't be kept for the final version of this PR. Since this is my first PR to rustc (and hopefully one of many), please give me feedback on how to better handle the PR process wherever possible. Thanks [Zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/Const.20std.3A.3Aops.20traits.20PR)
2 parents 2b643e9 + 361c978 commit 20bb932

File tree

6 files changed

+235
-106
lines changed

6 files changed

+235
-106
lines changed

‎library/core/src/internal_macros.rs‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ macro_rules! forward_ref_unop {
55
forward_ref_unop!(impl $imp, $method for $t,
66
#[stable(feature = "rust1", since = "1.0.0")]);
77
};
8+
(impl const $imp:ident, $method:ident for $t:ty) => {
9+
forward_ref_unop!(impl const $imp, $method for $t,
10+
#[stable(feature = "rust1", since = "1.0.0")]);
11+
};
12+
// Equivalent to the non-const version, with the addition of `rustc_const_unstable`
13+
(impl const $imp:ident, $method:ident for $t:ty, #[$attr:meta]) => {
14+
#[$attr]
15+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
16+
impl const $imp for &$t {
17+
type Output = <$t as $imp>::Output;
18+
19+
#[inline]
20+
fn $method(self) -> <$t as $imp>::Output {
21+
$imp::$method(*self)
22+
}
23+
}
24+
};
825
(impl $imp:ident, $method:ident for $t:ty, #[$attr:meta]) => {
926
#[$attr]
1027
impl $imp for &$t {
@@ -25,6 +42,45 @@ macro_rules! forward_ref_binop {
2542
forward_ref_binop!(impl $imp, $method for $t, $u,
2643
#[stable(feature = "rust1", since = "1.0.0")]);
2744
};
45+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty) => {
46+
forward_ref_binop!(impl const $imp, $method for $t, $u,
47+
#[stable(feature = "rust1", since = "1.0.0")]);
48+
};
49+
// Equivalent to the non-const version, with the addition of `rustc_const_unstable`
50+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
51+
#[$attr]
52+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
53+
impl<'a> const $imp<$u> for &'a $t {
54+
type Output = <$t as $imp<$u>>::Output;
55+
56+
#[inline]
57+
fn $method(self, other: $u) -> <$t as $imp<$u>>::Output {
58+
$imp::$method(*self, other)
59+
}
60+
}
61+
62+
#[$attr]
63+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
64+
impl const $imp<&$u> for $t {
65+
type Output = <$t as $imp<$u>>::Output;
66+
67+
#[inline]
68+
fn $method(self, other: &$u) -> <$t as $imp<$u>>::Output {
69+
$imp::$method(self, *other)
70+
}
71+
}
72+
73+
#[$attr]
74+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
75+
impl const $imp<&$u> for &$t {
76+
type Output = <$t as $imp<$u>>::Output;
77+
78+
#[inline]
79+
fn $method(self, other: &$u) -> <$t as $imp<$u>>::Output {
80+
$imp::$method(*self, *other)
81+
}
82+
}
83+
};
2884
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
2985
#[$attr]
3086
impl<'a> $imp<$u> for &'a $t {
@@ -65,6 +121,21 @@ macro_rules! forward_ref_op_assign {
65121
forward_ref_op_assign!(impl $imp, $method for $t, $u,
66122
#[stable(feature = "op_assign_builtins_by_ref", since = "1.22.0")]);
67123
};
124+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty) => {
125+
forward_ref_op_assign!(impl const $imp, $method for $t, $u,
126+
#[stable(feature = "op_assign_builtins_by_ref", since = "1.22.0")]);
127+
};
128+
// Equivalent to the non-const version, with the addition of `rustc_const_unstable`
129+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
130+
#[$attr]
131+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
132+
impl const $imp<&$u> for $t {
133+
#[inline]
134+
fn $method(&mut self, other: &$u) {
135+
$imp::$method(self, *other);
136+
}
137+
}
138+
};
68139
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
69140
#[$attr]
70141
impl $imp<&$u> for $t {

‎library/core/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
#![feature(const_maybe_uninit_as_ptr)]
118118
#![feature(const_maybe_uninit_assume_init)]
119119
#![feature(const_num_from_num)]
120+
#![feature(const_ops)]
120121
#![feature(const_option)]
121122
#![feature(const_pin)]
122123
#![feature(const_replace)]

‎library/core/src/num/nonzero.rs‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ macro_rules! nonzero_integers {
9292
}
9393

9494
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
95-
impl BitOr for $Ty {
95+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
96+
impl const BitOr for $Ty {
9697
type Output = Self;
9798
#[inline]
9899
fn bitor(self, rhs: Self) -> Self::Output {
@@ -103,7 +104,8 @@ macro_rules! nonzero_integers {
103104
}
104105

105106
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
106-
impl BitOr<$Int> for $Ty {
107+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
108+
impl const BitOr<$Int> for $Ty {
107109
type Output = Self;
108110
#[inline]
109111
fn bitor(self, rhs: $Int) -> Self::Output {
@@ -115,7 +117,8 @@ macro_rules! nonzero_integers {
115117
}
116118

117119
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
118-
impl BitOr<$Ty> for $Int {
120+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
121+
impl const BitOr<$Ty> for $Int {
119122
type Output = $Ty;
120123
#[inline]
121124
fn bitor(self, rhs: $Ty) -> Self::Output {
@@ -127,15 +130,17 @@ macro_rules! nonzero_integers {
127130
}
128131

129132
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
130-
impl BitOrAssign for $Ty {
133+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
134+
impl const BitOrAssign for $Ty {
131135
#[inline]
132136
fn bitor_assign(&mut self, rhs: Self) {
133137
*self = *self | rhs;
134138
}
135139
}
136140

137141
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
138-
impl BitOrAssign<$Int> for $Ty {
142+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
143+
impl const BitOrAssign<$Int> for $Ty {
139144
#[inline]
140145
fn bitor_assign(&mut self, rhs: $Int) {
141146
*self = *self | rhs;
@@ -257,7 +262,8 @@ macro_rules! nonzero_integers_div {
257262
( $( $Ty: ident($Int: ty); )+ ) => {
258263
$(
259264
#[stable(feature = "nonzero_div", since = "1.51.0")]
260-
impl Div<$Ty> for $Int {
265+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
266+
impl const Div<$Ty> for $Int {
261267
type Output = $Int;
262268
/// This operation rounds towards zero,
263269
/// truncating any fractional part of the exact result, and cannot panic.
@@ -270,7 +276,8 @@ macro_rules! nonzero_integers_div {
270276
}
271277

272278
#[stable(feature = "nonzero_div", since = "1.51.0")]
273-
impl Rem<$Ty> for $Int {
279+
#[rustc_const_unstable(feature = "const_ops", issue = "90080")]
280+
impl const Rem<$Ty> for $Int {
274281
type Output = $Int;
275282
/// This operation satisfies `n % d == n - (n / d) * d`, and cannot panic.
276283
#[inline]

0 commit comments

Comments
 (0)