Skip to content

Commit 3735575

Browse files
AlexApps99AlexApps99
committed
Added const versions of common numeric operations
1 parent eeb16a2 commit 3735575

File tree

6 files changed

+234
-107
lines changed

6 files changed

+234
-107
lines changed

‎library/core/src/internal_macros.rs

+68
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ 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+
(impl const $imp:ident, $method:ident for $t:ty, #[$attr:meta]) => {
13+
#[$attr]
14+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
15+
impl const $imp for &$t {
16+
type Output = <$t as $imp>::Output;
17+
18+
#[inline]
19+
fn $method(self) -> <$t as $imp>::Output {
20+
$imp::$method(*self)
21+
}
22+
}
23+
};
824
(impl $imp:ident, $method:ident for $t:ty, #[$attr:meta]) => {
925
#[$attr]
1026
impl $imp for &$t {
@@ -25,6 +41,44 @@ macro_rules! forward_ref_binop {
2541
forward_ref_binop!(impl $imp, $method for $t, $u,
2642
#[stable(feature = "rust1", since = "1.0.0")]);
2743
};
44+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty) => {
45+
forward_ref_binop!(impl const $imp, $method for $t, $u,
46+
#[stable(feature = "rust1", since = "1.0.0")]);
47+
};
48+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
49+
#[$attr]
50+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
51+
impl<'a> const $imp<$u> for &'a $t {
52+
type Output = <$t as $imp<$u>>::Output;
53+
54+
#[inline]
55+
fn $method(self, other: $u) -> <$t as $imp<$u>>::Output {
56+
$imp::$method(*self, other)
57+
}
58+
}
59+
60+
#[$attr]
61+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
62+
impl const $imp<&$u> for $t {
63+
type Output = <$t as $imp<$u>>::Output;
64+
65+
#[inline]
66+
fn $method(self, other: &$u) -> <$t as $imp<$u>>::Output {
67+
$imp::$method(self, *other)
68+
}
69+
}
70+
71+
#[$attr]
72+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
73+
impl const $imp<&$u> for &$t {
74+
type Output = <$t as $imp<$u>>::Output;
75+
76+
#[inline]
77+
fn $method(self, other: &$u) -> <$t as $imp<$u>>::Output {
78+
$imp::$method(*self, *other)
79+
}
80+
}
81+
};
2882
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
2983
#[$attr]
3084
impl<'a> $imp<$u> for &'a $t {
@@ -65,6 +119,20 @@ macro_rules! forward_ref_op_assign {
65119
forward_ref_op_assign!(impl $imp, $method for $t, $u,
66120
#[stable(feature = "op_assign_builtins_by_ref", since = "1.22.0")]);
67121
};
122+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty) => {
123+
forward_ref_op_assign!(impl const $imp, $method for $t, $u,
124+
#[stable(feature = "op_assign_builtins_by_ref", since = "1.22.0")]);
125+
};
126+
(impl const $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
127+
#[$attr]
128+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
129+
impl const $imp<&$u> for $t {
130+
#[inline]
131+
fn $method(&mut self, other: &$u) {
132+
$imp::$method(self, *other);
133+
}
134+
}
135+
};
68136
(impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
69137
#[$attr]
70138
impl $imp<&$u> for $t {

‎library/core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
#![feature(const_likely)]
116116
#![feature(const_maybe_uninit_as_ptr)]
117117
#![feature(const_maybe_uninit_assume_init)]
118+
#![feature(const_ops)]
118119
#![feature(const_option)]
119120
#![feature(const_pin)]
120121
#![feature(const_replace)]

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ macro_rules! nonzero_integers {
8282
}
8383

8484
#[stable(feature = "from_nonzero", since = "1.31.0")]
85-
impl From<$Ty> for $Int {
85+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
86+
impl const From<$Ty> for $Int {
8687
#[doc = concat!("Converts a `", stringify!($Ty), "` into an `", stringify!($Int), "`")]
8788
#[inline]
8889
fn from(nonzero: $Ty) -> Self {
@@ -91,7 +92,8 @@ macro_rules! nonzero_integers {
9192
}
9293

9394
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
94-
impl BitOr for $Ty {
95+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
96+
impl const BitOr for $Ty {
9597
type Output = Self;
9698
#[inline]
9799
fn bitor(self, rhs: Self) -> Self::Output {
@@ -102,7 +104,8 @@ macro_rules! nonzero_integers {
102104
}
103105

104106
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
105-
impl BitOr<$Int> for $Ty {
107+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
108+
impl const BitOr<$Int> for $Ty {
106109
type Output = Self;
107110
#[inline]
108111
fn bitor(self, rhs: $Int) -> Self::Output {
@@ -114,7 +117,8 @@ macro_rules! nonzero_integers {
114117
}
115118

116119
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
117-
impl BitOr<$Ty> for $Int {
120+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
121+
impl const BitOr<$Ty> for $Int {
118122
type Output = $Ty;
119123
#[inline]
120124
fn bitor(self, rhs: $Ty) -> Self::Output {
@@ -126,15 +130,17 @@ macro_rules! nonzero_integers {
126130
}
127131

128132
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
129-
impl BitOrAssign for $Ty {
133+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
134+
impl const BitOrAssign for $Ty {
130135
#[inline]
131136
fn bitor_assign(&mut self, rhs: Self) {
132137
*self = *self | rhs;
133138
}
134139
}
135140

136141
#[stable(feature = "nonzero_bitor", since = "1.45.0")]
137-
impl BitOrAssign<$Int> for $Ty {
142+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
143+
impl const BitOrAssign<$Int> for $Ty {
138144
#[inline]
139145
fn bitor_assign(&mut self, rhs: $Int) {
140146
*self = *self | rhs;
@@ -256,7 +262,8 @@ macro_rules! nonzero_integers_div {
256262
( $( $Ty: ident($Int: ty); )+ ) => {
257263
$(
258264
#[stable(feature = "nonzero_div", since = "1.51.0")]
259-
impl Div<$Ty> for $Int {
265+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
266+
impl const Div<$Ty> for $Int {
260267
type Output = $Int;
261268
/// This operation rounds towards zero,
262269
/// truncating any fractional part of the exact result, and cannot panic.
@@ -269,7 +276,8 @@ macro_rules! nonzero_integers_div {
269276
}
270277

271278
#[stable(feature = "nonzero_div", since = "1.51.0")]
272-
impl Rem<$Ty> for $Int {
279+
#[rustc_const_unstable(feature = "const_ops", issue = "69420")]
280+
impl const Rem<$Ty> for $Int {
273281
type Output = $Int;
274282
/// This operation satisfies `n % d == n - (n / d) * d`, and cannot panic.
275283
#[inline]

0 commit comments

Comments
 (0)