mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Temporarily rename int_roundings functions to avoid conflicts"

Browse Source 
This reverts commit 3ece63b64e.
This commit is contained in:
Jacob Pratt 2021-11-22 15:49:04 -05:00
parent 883a241c08
commit 41f70f3491
No known key found for this signature in database
GPG Key ID: B80E19E4662B5AA4
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/core/src/num/int_macros.rs
View File

@ -2025,17 +2025,17 @@ pub const fn rem_euclid(self, rhs: Self) -> Self {
#[doc = concat!("let a: ", stringify!($SelfT)," = 8;")] #[doc = concat!("let a: ", stringify!($SelfT)," = 8;")]
/// let b = 3; /// let b = 3;
/// ///
/// assert_eq!(a.unstable_div_floor(b), 2); /// assert_eq!(a.div_floor(b), 2);
/// assert_eq!(a.unstable_div_floor(-b), -3); /// assert_eq!(a.div_floor(-b), -3);
/// assert_eq!((-a).unstable_div_floor(b), -3); /// assert_eq!((-a).div_floor(b), -3);
/// assert_eq!((-a).unstable_div_floor(-b), 2); /// assert_eq!((-a).div_floor(-b), 2);
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline] #[inline]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_div_floor(self, rhs: Self) -> Self { pub const fn div_floor(self, rhs: Self) -> Self {
let d = self / rhs; let d = self / rhs;
let r = self % rhs; let r = self % rhs;
if (r > 0 && rhs < 0) || (r < 0 && rhs > 0) { if (r > 0 && rhs < 0) || (r < 0 && rhs > 0) {
@ -2060,17 +2060,17 @@ pub const fn unstable_div_floor(self, rhs: Self) -> Self {
#[doc = concat!("let a: ", stringify!($SelfT)," = 8;")] #[doc = concat!("let a: ", stringify!($SelfT)," = 8;")]
/// let b = 3; /// let b = 3;
/// ///
/// assert_eq!(a.unstable_div_ceil(b), 3); /// assert_eq!(a.div_ceil(b), 3);
/// assert_eq!(a.unstable_div_ceil(-b), -2); /// assert_eq!(a.div_ceil(-b), -2);
/// assert_eq!((-a).unstable_div_ceil(b), -2); /// assert_eq!((-a).div_ceil(b), -2);
/// assert_eq!((-a).unstable_div_ceil(-b), 3); /// assert_eq!((-a).div_ceil(-b), 3);
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline] #[inline]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_div_ceil(self, rhs: Self) -> Self { pub const fn div_ceil(self, rhs: Self) -> Self {
let d = self / rhs; let d = self / rhs;
let r = self % rhs; let r = self % rhs;
if (r > 0 && rhs > 0) || (r < 0 && rhs < 0) { if (r > 0 && rhs > 0) || (r < 0 && rhs < 0) {
@ -2095,21 +2095,21 @@ pub const fn unstable_div_ceil(self, rhs: Self) -> Self {
/// ///
/// ``` /// ```
/// #![feature(int_roundings)] /// #![feature(int_roundings)]
#[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".unstable_next_multiple_of(8), 16);")] #[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".next_multiple_of(8), 16);")]
#[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".unstable_next_multiple_of(8), 24);")] #[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".next_multiple_of(8), 24);")]
#[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".unstable_next_multiple_of(-8), 16);")] #[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".next_multiple_of(-8), 16);")]
#[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".unstable_next_multiple_of(-8), 16);")] #[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".next_multiple_of(-8), 16);")]
#[doc = concat!("assert_eq!((-16_", stringify!($SelfT), ").unstable_next_multiple_of(8), -16);")] #[doc = concat!("assert_eq!((-16_", stringify!($SelfT), ").next_multiple_of(8), -16);")]
#[doc = concat!("assert_eq!((-23_", stringify!($SelfT), ").unstable_next_multiple_of(8), -16);")] #[doc = concat!("assert_eq!((-23_", stringify!($SelfT), ").next_multiple_of(8), -16);")]
#[doc = concat!("assert_eq!((-16_", stringify!($SelfT), ").unstable_next_multiple_of(-8), -16);")] #[doc = concat!("assert_eq!((-16_", stringify!($SelfT), ").next_multiple_of(-8), -16);")]
#[doc = concat!("assert_eq!((-23_", stringify!($SelfT), ").unstable_next_multiple_of(-8), -24);")] #[doc = concat!("assert_eq!((-23_", stringify!($SelfT), ").next_multiple_of(-8), -24);")]
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline] #[inline]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_next_multiple_of(self, rhs: Self) -> Self { pub const fn next_multiple_of(self, rhs: Self) -> Self {
// This would otherwise fail when calculating `r` when self == T::MIN. // This would otherwise fail when calculating `r` when self == T::MIN.
if rhs == -1 { if rhs == -1 {
return self; return self;

14
library/core/src/num/uint_macros.rs
View File

@ -2024,14 +2024,14 @@ pub const fn rem_euclid(self, rhs: Self) -> Self {
/// ///
/// ``` /// ```
/// #![feature(int_roundings)] /// #![feature(int_roundings)]
#[doc = concat!("assert_eq!(7_", stringify!($SelfT), ".unstable_div_floor(4), 1);")] #[doc = concat!("assert_eq!(7_", stringify!($SelfT), ".div_floor(4), 1);")]
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline(always)] #[inline(always)]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_div_floor(self, rhs: Self) -> Self { pub const fn div_floor(self, rhs: Self) -> Self {
self / rhs self / rhs
} }
@ -2047,14 +2047,14 @@ pub const fn unstable_div_floor(self, rhs: Self) -> Self {
/// ///
/// ``` /// ```
/// #![feature(int_roundings)] /// #![feature(int_roundings)]
#[doc = concat!("assert_eq!(7_", stringify!($SelfT), ".unstable_div_ceil(4), 2);")] #[doc = concat!("assert_eq!(7_", stringify!($SelfT), ".div_ceil(4), 2);")]
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline] #[inline]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_div_ceil(self, rhs: Self) -> Self { pub const fn div_ceil(self, rhs: Self) -> Self {
let d = self / rhs; let d = self / rhs;
let r = self % rhs; let r = self % rhs;
if r > 0 && rhs > 0 { if r > 0 && rhs > 0 {
@ -2077,15 +2077,15 @@ pub const fn unstable_div_ceil(self, rhs: Self) -> Self {
/// ///
/// ``` /// ```
/// #![feature(int_roundings)] /// #![feature(int_roundings)]
#[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".unstable_next_multiple_of(8), 16);")] #[doc = concat!("assert_eq!(16_", stringify!($SelfT), ".next_multiple_of(8), 16);")]
#[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".unstable_next_multiple_of(8), 24);")] #[doc = concat!("assert_eq!(23_", stringify!($SelfT), ".next_multiple_of(8), 24);")]
/// ``` /// ```
#[unstable(feature = "int_roundings", issue = "88581")] #[unstable(feature = "int_roundings", issue = "88581")]
#[must_use = "this returns the result of the operation, \ #[must_use = "this returns the result of the operation, \
without modifying the original"] without modifying the original"]
#[inline] #[inline]
#[rustc_inherit_overflow_checks] #[rustc_inherit_overflow_checks]
pub const fn unstable_next_multiple_of(self, rhs: Self) -> Self { pub const fn next_multiple_of(self, rhs: Self) -> Self {
match self % rhs { match self % rhs {
0 => self, 0 => self,
r => self + (rhs - r) r => self + (rhs - r)

34
library/core/tests/num/int_macros.rs
View File

@ -294,33 +294,33 @@ fn test_pow() {
fn test_div_floor() { fn test_div_floor() {
let a: $T = 8; let a: $T = 8;
let b = 3; let b = 3;
assert_eq!(a.unstable_div_floor(b), 2); assert_eq!(a.div_floor(b), 2);
assert_eq!(a.unstable_div_floor(-b), -3); assert_eq!(a.div_floor(-b), -3);
assert_eq!((-a).unstable_div_floor(b), -3); assert_eq!((-a).div_floor(b), -3);
assert_eq!((-a).unstable_div_floor(-b), 2); assert_eq!((-a).div_floor(-b), 2);
} }
#[test] #[test]
fn test_div_ceil() { fn test_div_ceil() {
let a: $T = 8; let a: $T = 8;
let b = 3; let b = 3;
assert_eq!(a.unstable_div_ceil(b), 3); assert_eq!(a.div_ceil(b), 3);
assert_eq!(a.unstable_div_ceil(-b), -2); assert_eq!(a.div_ceil(-b), -2);
assert_eq!((-a).unstable_div_ceil(b), -2); assert_eq!((-a).div_ceil(b), -2);
assert_eq!((-a).unstable_div_ceil(-b), 3); assert_eq!((-a).div_ceil(-b), 3);
} }
#[test] #[test]
fn test_next_multiple_of() { fn test_next_multiple_of() {
assert_eq!((16 as $T).unstable_next_multiple_of(8), 16); assert_eq!((16 as $T).next_multiple_of(8), 16);
assert_eq!((23 as $T).unstable_next_multiple_of(8), 24); assert_eq!((23 as $T).next_multiple_of(8), 24);
assert_eq!((16 as $T).unstable_next_multiple_of(-8), 16); assert_eq!((16 as $T).next_multiple_of(-8), 16);
assert_eq!((23 as $T).unstable_next_multiple_of(-8), 16); assert_eq!((23 as $T).next_multiple_of(-8), 16);
assert_eq!((-16 as $T).unstable_next_multiple_of(8), -16); assert_eq!((-16 as $T).next_multiple_of(8), -16);
assert_eq!((-23 as $T).unstable_next_multiple_of(8), -16); assert_eq!((-23 as $T).next_multiple_of(8), -16);
assert_eq!((-16 as $T).unstable_next_multiple_of(-8), -16); assert_eq!((-16 as $T).next_multiple_of(-8), -16);
assert_eq!((-23 as $T).unstable_next_multiple_of(-8), -24); assert_eq!((-23 as $T).next_multiple_of(-8), -24);
assert_eq!(MIN.unstable_next_multiple_of(-1), MIN); assert_eq!(MIN.next_multiple_of(-1), MIN);
} }
#[test] #[test]

10
library/core/tests/num/uint_macros.rs
View File

@ -208,19 +208,19 @@ fn test_pow() {
#[test] #[test]
fn test_div_floor() { fn test_div_floor() {
assert_eq!((8 as $T).unstable_div_floor(3), 2); assert_eq!((8 as $T).div_floor(3), 2);
} }
#[test] #[test]
fn test_div_ceil() { fn test_div_ceil() {
assert_eq!((8 as $T).unstable_div_ceil(3), 3); assert_eq!((8 as $T).div_ceil(3), 3);
} }
#[test] #[test]
fn test_next_multiple_of() { fn test_next_multiple_of() {
assert_eq!((16 as $T).unstable_next_multiple_of(8), 16); assert_eq!((16 as $T).next_multiple_of(8), 16);
assert_eq!((23 as $T).unstable_next_multiple_of(8), 24); assert_eq!((23 as $T).next_multiple_of(8), 24);
assert_eq!(MAX.unstable_next_multiple_of(1), MAX); assert_eq!(MAX.next_multiple_of(1), MAX);
} }
#[test] #[test]