@@ -2421,7 +2421,7 @@ macro_rules! uint_impl {
2421
2421
}
2422
2422
2423
2423
/// Calculates `self` + `rhs` + `carry` and returns a tuple containing
2424
- /// the sum and the output carry.
2424
+ /// the sum and the output carry (in that order) .
2425
2425
///
2426
2426
/// Performs "ternary addition" of two integer operands and a carry-in
2427
2427
/// bit, and returns an output integer and a carry-out bit. This allows
@@ -2439,8 +2439,6 @@ macro_rules! uint_impl {
2439
2439
/// # Examples
2440
2440
///
2441
2441
/// ```
2442
- /// #![feature(bigint_helper_methods)]
2443
- ///
2444
2442
#[ doc = concat!( "// 3 MAX (a = 3 × 2^" , stringify!( $BITS) , " + 2^" , stringify!( $BITS) , " - 1)" ) ]
2445
2443
#[ doc = concat!( "// + 5 7 (b = 5 × 2^" , stringify!( $BITS) , " + 7)" ) ]
2446
2444
/// // ---------
@@ -2457,7 +2455,7 @@ macro_rules! uint_impl {
2457
2455
///
2458
2456
/// assert_eq!((sum1, sum0), (9, 6));
2459
2457
/// ```
2460
- #[ unstable ( feature = "bigint_helper_methods " , issue = "85532 " ) ]
2458
+ #[ stable ( feature = "min_bigint_helpers " , since = "CURRENT_RUSTC_VERSION " ) ]
2461
2459
#[ rustc_const_unstable( feature = "bigint_helper_methods" , issue = "85532" ) ]
2462
2460
#[ must_use = "this returns the result of the operation, \
2463
2461
without modifying the original"]
@@ -2625,6 +2623,9 @@ macro_rules! uint_impl {
2625
2623
/// indicating whether an arithmetic overflow would occur. If an
2626
2624
/// overflow would have occurred then the wrapped value is returned.
2627
2625
///
2626
+ /// If you want the *value* of the overflow, rather than just *whether*
2627
+ /// an overflow occurred, see [`Self::carrying_mul`].
2628
+ ///
2628
2629
/// # Examples
2629
2630
///
2630
2631
/// Please note that this example is shared between integer types.
@@ -2644,25 +2645,41 @@ macro_rules! uint_impl {
2644
2645
( a as Self , b)
2645
2646
}
2646
2647
2647
- /// Calculates the complete product `self * rhs` without the possibility to overflow .
2648
+ /// Calculates the complete double-width product `self * rhs`.
2648
2649
///
2649
2650
/// This returns the low-order (wrapping) bits and the high-order (overflow) bits
2650
- /// of the result as two separate values, in that order.
2651
+ /// of the result as two separate values, in that order. As such,
2652
+ /// `a.widening_mul(b).0` produces the same result as `a.wrapping_mul(b)`.
2651
2653
///
2652
- /// If you also need to add a carry to the wide result, then you want
2653
- /// [`Self::carrying_mul`] instead.
2654
+ /// If you also need to add a value and/or carry to the wide result, then you want
2655
+ /// [`Self::carrying_mul_add`] instead.
2656
+ ///
2657
+ /// If you just want to know *whether* the multiplication overflowed, then you
2658
+ /// want [`Self::overflowing_mul`] instead.
2654
2659
///
2655
2660
/// # Examples
2656
2661
///
2662
+ /// ```
2663
+ #[ doc = concat!( "assert_eq!(5_" , stringify!( $SelfT) , ".widening_mul(7), (35, 0));" ) ]
2664
+ #[ doc = concat!( "assert_eq!(" , stringify!( $SelfT) , "::MAX.widening_mul(" , stringify!( $SelfT) , "::MAX), (1, " , stringify!( $SelfT) , "::MAX - 1));" ) ]
2665
+ /// ```
2666
+ ///
2667
+ /// Compared to other `*_mul` methods:
2668
+ /// ```
2669
+ #[ doc = concat!( "assert_eq!(" , stringify!( $SelfT) , "::widening_mul(1 << " , stringify!( $BITS_MINUS_ONE) , ", 6), (0, 3));" ) ]
2670
+ #[ doc = concat!( "assert_eq!(" , stringify!( $SelfT) , "::overflowing_mul(1 << " , stringify!( $BITS_MINUS_ONE) , ", 6), (0, true));" ) ]
2671
+ #[ doc = concat!( "assert_eq!(" , stringify!( $SelfT) , "::wrapping_mul(1 << " , stringify!( $BITS_MINUS_ONE) , ", 6), 0);" ) ]
2672
+ #[ doc = concat!( "assert_eq!(" , stringify!( $SelfT) , "::checked_mul(1 << " , stringify!( $BITS_MINUS_ONE) , ", 6), None);" ) ]
2673
+ /// ```
2674
+ ///
2657
2675
/// Please note that this example is shared between integer types.
2658
2676
/// Which explains why `u32` is used here.
2659
2677
///
2660
2678
/// ```
2661
- /// #![feature(bigint_helper_methods)]
2662
2679
/// assert_eq!(5u32.widening_mul(2), (10, 0));
2663
2680
/// assert_eq!(1_000_000_000u32.widening_mul(10), (1410065408, 2));
2664
2681
/// ```
2665
- #[ unstable ( feature = "bigint_helper_methods " , issue = "85532 " ) ]
2682
+ #[ stable ( feature = "min_bigint_helpers " , since = "CURRENT_RUSTC_VERSION " ) ]
2666
2683
#[ rustc_const_unstable( feature = "bigint_helper_methods" , issue = "85532" ) ]
2667
2684
#[ must_use = "this returns the result of the operation, \
2668
2685
without modifying the original"]
@@ -2756,26 +2773,27 @@ macro_rules! uint_impl {
2756
2773
Self :: carrying_mul_add( self , rhs, carry, 0 )
2757
2774
}
2758
2775
2759
- /// Calculates the "full multiplication" `self * rhs + carry1 + carry2`
2760
- /// without the possibility to overflow.
2776
+ /// Calculates the "full multiplication" `self * rhs + carry1 + carry2`.
2761
2777
///
2762
2778
/// This returns the low-order (wrapping) bits and the high-order (overflow) bits
2763
2779
/// of the result as two separate values, in that order.
2764
2780
///
2781
+ /// This cannot overflow, as the double-width result has exactly enough
2782
+ /// space for the largest possible result. This is equivalent to how, in
2783
+ /// decimal, 9 × 9 + 9 + 9 = 81 + 18 = 99 = 9×10⁰ + 9×10¹ = 10² - 1.
2784
+ ///
2765
2785
/// Performs "long multiplication" which takes in an extra amount to add, and may return an
2766
2786
/// additional amount of overflow. This allows for chaining together multiple
2767
2787
/// multiplications to create "big integers" which represent larger values.
2768
2788
///
2769
- /// If you don't need either `carry`, then you can use [`Self::widening_mul`] instead,
2770
- /// and if you only need one `carry`, then you can use [`Self::carrying_mul`] instead.
2789
+ /// If you don't need either `carry`, then you can use [`Self::widening_mul`] instead.
2771
2790
///
2772
2791
/// # Examples
2773
2792
///
2774
2793
/// Please note that this example is shared between integer types,
2775
2794
/// which explains why `u32` is used here.
2776
2795
///
2777
2796
/// ```
2778
- /// #![feature(bigint_helper_methods)]
2779
2797
/// assert_eq!(5u32.carrying_mul_add(2, 0, 0), (10, 0));
2780
2798
/// assert_eq!(5u32.carrying_mul_add(2, 10, 10), (30, 0));
2781
2799
/// assert_eq!(1_000_000_000u32.carrying_mul_add(10, 0, 0), (1410065408, 2));
@@ -2792,8 +2810,6 @@ macro_rules! uint_impl {
2792
2810
/// using `u8` for simplicity of the demonstration.
2793
2811
///
2794
2812
/// ```
2795
- /// #![feature(bigint_helper_methods)]
2796
- ///
2797
2813
/// fn quadratic_mul<const N: usize>(a: [u8; N], b: [u8; N]) -> [u8; N] {
2798
2814
/// let mut out = [0; N];
2799
2815
/// for j in 0..N {
@@ -2808,13 +2824,13 @@ macro_rules! uint_impl {
2808
2824
/// // -1 * -1 == 1
2809
2825
/// assert_eq!(quadratic_mul([0xFF; 3], [0xFF; 3]), [1, 0, 0]);
2810
2826
///
2811
- /// assert_eq!(u32::wrapping_mul(0x9e3779b9, 0x7f4a7c15), 0xCFFC982D );
2827
+ /// assert_eq!(u32::wrapping_mul(0x9e3779b9, 0x7f4a7c15), 0xcffc982d );
2812
2828
/// assert_eq!(
2813
2829
/// quadratic_mul(u32::to_le_bytes(0x9e3779b9), u32::to_le_bytes(0x7f4a7c15)),
2814
- /// u32::to_le_bytes(0xCFFC982D )
2830
+ /// u32::to_le_bytes(0xcffc982d )
2815
2831
/// );
2816
2832
/// ```
2817
- #[ unstable ( feature = "bigint_helper_methods " , issue = "85532 " ) ]
2833
+ #[ stable ( feature = "min_bigint_helpers " , since = "CURRENT_RUSTC_VERSION " ) ]
2818
2834
#[ rustc_const_unstable( feature = "bigint_helper_methods" , issue = "85532" ) ]
2819
2835
#[ must_use = "this returns the result of the operation, \
2820
2836
without modifying the original"]
0 commit comments