Skip to content

Rollup of 10 pull requests #90934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Nov 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2bdd075
implement `Termination` for `Result<Infallible, E>`
ibraheemdev Sep 2, 2021
2433d37
simplify `impl Termination for Result<Infallible, E>`
ibraheemdev Sep 3, 2021
caf206b
Stabilize File::options()
workingjubilee May 27, 2021
181716a
compare between Path instead of str
tamaroning Nov 11, 2021
a24e2ed
Android is not GNU
cuviper Nov 12, 2021
2d46d1b
Rename WASI's `is_character_device` to `is_char_device`.
sunfishcode Nov 12, 2021
6323f92
Remove bigint_helper_methods for *signed* types
scottmcm Nov 13, 2021
94ca0b3
fix ICE on Miri/CTFE copy of half a pointer
RalfJung Nov 14, 2021
60595f7
disable portable SIMD tests in Miri
RalfJung Nov 14, 2021
ab5434f
Move some tests to more reasonable directories
c410-f3r Nov 14, 2021
c4884bb
Support having -Z and -C options with the same name
joshtriplett Oct 21, 2021
e35b7bb
Stabilize -Z strip as -C strip
joshtriplett Oct 21, 2021
73ec27d
Rollup merge of #85766 - workingjubilee:file-options, r=yaahc
JohnTitor Nov 16, 2021
c44455a
Rollup merge of #88601 - ibraheemdev:termination-result-infallible, r…
JohnTitor Nov 16, 2021
a0dc4ab
Rollup merge of #90058 - joshtriplett:stabilize-strip, r=wesleywiser
JohnTitor Nov 16, 2021
aaac528
Rollup merge of #90790 - tamaroning:fix-lib-std-test, r=Mark-Simulacrum
JohnTitor Nov 16, 2021
ed7ed5f
Rollup merge of #90834 - cuviper:android-gnu, r=petrochenkov
JohnTitor Nov 16, 2021
96cfc9e
Rollup merge of #90835 - sunfishcode:sunfishcode/wasi-char-device, r=…
JohnTitor Nov 16, 2021
12d5297
Rollup merge of #90837 - c410-f3r:testsssssss, r=petrochenkov
JohnTitor Nov 16, 2021
fb96ecc
Rollup merge of #90848 - scottmcm:remove-signed-bigint-helpers, r=jos…
JohnTitor Nov 16, 2021
fff9055
Rollup merge of #90892 - RalfJung:miri-partial-ptr-copy, r=oli-obk
JohnTitor Nov 16, 2021
35dd1f6
Rollup merge of #90909 - RalfJung:miri-no-portable-simd, r=workingjub…
JohnTitor Nov 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove bigint_helper_methods for *signed* types
These are working well for *unsigned* types, for the the signed ones there are a bunch of questions about what the semantics and API should be.  And for the main "helpers for big integer implementations" use, there's no need for the signed versions anyway.

And there are plenty of other methods which exist for unsigned types but not signed ones, like `next_power_of_two`, so this isn't unusual.

Fixes 90541
  • Loading branch information
scottmcm committed Nov 13, 2021
commit 6323f928bf7676eb8af8230f01672f96fd9498c4
54 changes: 0 additions & 54 deletions library/core/src/num/int_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1511,33 +1511,6 @@ macro_rules! int_impl {
(a as Self, b)
}

/// Calculates `self + rhs + carry` without the ability to overflow.
///
/// Performs "ternary addition" which takes in an extra bit to add, and may return an
/// additional bit of overflow. This allows for chaining together multiple additions
/// to create "big integers" which represent larger values.
///
/// # Examples
///
/// Basic usage
///
/// ```
/// #![feature(bigint_helper_methods)]
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".carrying_add(2, false), (7, false));")]
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".carrying_add(2, true), (8, false));")]
#[doc = concat!("assert_eq!(", stringify!($SelfT), "::MAX.carrying_add(1, false), (", stringify!($SelfT), "::MIN, false));")]
#[doc = concat!("assert_eq!(", stringify!($SelfT), "::MAX.carrying_add(1, true), (", stringify!($SelfT), "::MIN + 1, false));")]
/// ```
#[unstable(feature = "bigint_helper_methods", issue = "85532")]
#[rustc_const_unstable(feature = "const_bigint_helper_methods", issue = "85532")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[inline]
pub const fn carrying_add(self, rhs: Self, carry: bool) -> (Self, bool) {
let (sum, carry) = (self as $UnsignedT).carrying_add(rhs as $UnsignedT, carry);
(sum as $SelfT, carry)
}

/// Calculates `self` + `rhs` with an unsigned `rhs`
///
/// Returns a tuple of the addition along with a boolean indicating
Expand Down Expand Up @@ -1589,33 +1562,6 @@ macro_rules! int_impl {
(a as Self, b)
}

/// Calculates `self - rhs - borrow` without the ability to overflow.
///
/// Performs "ternary subtraction" which takes in an extra bit to subtract, and may return
/// an additional bit of overflow. This allows for chaining together multiple subtractions
/// to create "big integers" which represent larger values.
///
/// # Examples
///
/// Basic usage
///
/// ```
/// #![feature(bigint_helper_methods)]
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".borrowing_sub(2, false), (3, false));")]
#[doc = concat!("assert_eq!(5", stringify!($SelfT), ".borrowing_sub(2, true), (2, false));")]
#[doc = concat!("assert_eq!(", stringify!($SelfT), "::MIN.borrowing_sub(1, false), (", stringify!($SelfT), "::MAX, false));")]
#[doc = concat!("assert_eq!(", stringify!($SelfT), "::MIN.borrowing_sub(1, true), (", stringify!($SelfT), "::MAX - 1, false));")]
/// ```
#[unstable(feature = "bigint_helper_methods", issue = "85532")]
#[rustc_const_unstable(feature = "const_bigint_helper_methods", issue = "85532")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[inline]
pub const fn borrowing_sub(self, rhs: Self, borrow: bool) -> (Self, bool) {
let (sum, borrow) = (self as $UnsignedT).borrowing_sub(rhs as $UnsignedT, borrow);
(sum as $SelfT, borrow)
}

/// Calculates `self` - `rhs` with an unsigned `rhs`
///
/// Returns a tuple of the subtraction along with a boolean indicating
Expand Down
15 changes: 1 addition & 14 deletions library/core/src/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ depending on the target pointer size.

macro_rules! widening_impl {
($SelfT:ty, $WideT:ty, $BITS:literal, unsigned) => {
widening_impl!($SelfT, $WideT, $BITS, "");
};
($SelfT:ty, $WideT:ty, $BITS:literal, signed) => {
widening_impl!($SelfT, $WideT, $BITS, "# //");
};
($SelfT:ty, $WideT:ty, $BITS:literal, $AdaptiveTestPrefix:literal) => {
/// Calculates the complete product `self * rhs` without the possibility to overflow.
///
/// This returns the low-order (wrapping) bits and the high-order (overflow) bits
Expand Down Expand Up @@ -154,7 +148,7 @@ macro_rules! widening_impl {
/// assert_eq!(5u32.carrying_mul(2, 10), (20, 0));
/// assert_eq!(1_000_000_000u32.carrying_mul(10, 0), (1410065408, 2));
/// assert_eq!(1_000_000_000u32.carrying_mul(10, 10), (1410065418, 2));
#[doc = concat!($AdaptiveTestPrefix, "assert_eq!(",
#[doc = concat!("assert_eq!(",
stringify!($SelfT), "::MAX.carrying_mul(", stringify!($SelfT), "::MAX, ", stringify!($SelfT), "::MAX), ",
"(0, ", stringify!($SelfT), "::MAX));"
)]
Expand Down Expand Up @@ -203,22 +197,19 @@ macro_rules! widening_impl {
impl i8 {
int_impl! { i8, i8, u8, 8, 7, -128, 127, 2, "-0x7e", "0xa", "0x12", "0x12", "0x48",
"[0x12]", "[0x12]", "", "" }
widening_impl! { i8, i16, 8, signed }
}

#[lang = "i16"]
impl i16 {
int_impl! { i16, i16, u16, 16, 15, -32768, 32767, 4, "-0x5ffd", "0x3a", "0x1234", "0x3412",
"0x2c48", "[0x34, 0x12]", "[0x12, 0x34]", "", "" }
widening_impl! { i16, i32, 16, signed }
}

#[lang = "i32"]
impl i32 {
int_impl! { i32, i32, u32, 32, 31, -2147483648, 2147483647, 8, "0x10000b3", "0xb301",
"0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]",
"[0x12, 0x34, 0x56, 0x78]", "", "" }
widening_impl! { i32, i64, 32, signed }
}

#[lang = "i64"]
Expand All @@ -227,7 +218,6 @@ impl i64 {
"0xaa00000000006e1", "0x6e10aa", "0x1234567890123456", "0x5634129078563412",
"0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]", "", "" }
widening_impl! { i64, i128, 64, signed }
}

#[lang = "i128"]
Expand All @@ -248,7 +238,6 @@ impl isize {
int_impl! { isize, i16, usize, 16, 15, -32768, 32767, 4, "-0x5ffd", "0x3a", "0x1234",
"0x3412", "0x2c48", "[0x34, 0x12]", "[0x12, 0x34]",
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
widening_impl! { isize, i32, 16, signed }
}

#[cfg(target_pointer_width = "32")]
Expand All @@ -258,7 +247,6 @@ impl isize {
"0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]",
"[0x12, 0x34, 0x56, 0x78]",
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
widening_impl! { isize, i64, 32, signed }
}

#[cfg(target_pointer_width = "64")]
Expand All @@ -269,7 +257,6 @@ impl isize {
"0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
widening_impl! { isize, i128, 64, signed }
}

/// If 6th bit set ascii is upper case.
Expand Down