diff options
| author | bors <bors@rust-lang.org> | 2019-06-01 06:34:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-01 06:34:15 +0000 |
| commit | 885c7dfddcca11fa543d99d702c024c3f6bfe07b (patch) | |
| tree | 09bd37a6487bd7d61487c85efb4482f1ce6c2cd2 /src/libcore | |
| parent | 8b40a188cee5bef97526dfc271afbd2a98008183 (diff) | |
| parent | 23de37657220821cd3cb1392bde22c9f7b27b65b (diff) | |
| download | rust-885c7dfddcca11fa543d99d702c024c3f6bfe07b.tar.gz rust-885c7dfddcca11fa543d99d702c024c3f6bfe07b.zip | |
Auto merge of #61418 - Centril:rollup-yvj33a1, r=Centril
Rollup of 8 pull requests Successful merges: - #60729 (Expand dynamic drop tests for cases in #47949) - #61263 (Don't generate div inside header (h4/h3/h...) elements) - #61364 (Stabilize reverse_bits feature) - #61375 (Make "panic did not include expected string" message consistent) - #61387 (Remove ty::BrFresh and RegionConstraintCollector::new_bound) - #61389 (Remove GlobalArenas and use Arena instead) - #61391 (Doc comment fixes for `rustc::mir::interpret::InterpretCx`) - #61403 (Remove unnecessary `-Z continue-parse-after-error` from tests) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/num/mod.rs | 9 | ||||
| -rw-r--r-- | src/libcore/num/wrapping.rs | 3 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 |
4 files changed, 3 insertions, 11 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 4a70329b64b..ad352048047 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -120,7 +120,6 @@ #![feature(const_str_len)] #![feature(const_int_conversion)] #![feature(const_transmute)] -#![feature(reverse_bits)] #![feature(non_exhaustive)] #![feature(structural_match)] #![feature(abi_unadjusted)] diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 7ec75ed0114..7145bf1fbc0 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -463,15 +463,12 @@ assert_eq!(m, ", $swapped, "); Basic usage: ``` -#![feature(reverse_bits)] - let n = ", $swap_op, stringify!($SelfT), "; let m = n.reverse_bits(); assert_eq!(m, ", $reversed, "); ```"), - #[unstable(feature = "reverse_bits", issue = "48763")] - #[rustc_const_unstable(feature = "const_int_conversion")] + #[stable(feature = "reverse_bits", since = "1.37.0")] #[inline] #[must_use] pub const fn reverse_bits(self) -> Self { @@ -2514,14 +2511,12 @@ assert_eq!(m, ", $swapped, "); Basic usage: ``` -#![feature(reverse_bits)] - let n = ", $swap_op, stringify!($SelfT), "; let m = n.reverse_bits(); assert_eq!(m, ", $reversed, "); ```"), - #[unstable(feature = "reverse_bits", issue = "48763")] + #[stable(feature = "reverse_bits", since = "1.37.0")] #[inline] #[must_use] pub const fn reverse_bits(self) -> Self { diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs index 5eb5ec558f8..fd129a306d1 100644 --- a/src/libcore/num/wrapping.rs +++ b/src/libcore/num/wrapping.rs @@ -511,7 +511,6 @@ assert_eq!(n.trailing_zeros(), 3); /// Basic usage: /// /// ``` - /// #![feature(reverse_bits)] /// use std::num::Wrapping; /// /// let n = Wrapping(0b0000000_01010101i16); @@ -522,7 +521,7 @@ assert_eq!(n.trailing_zeros(), 3); /// assert_eq!(m.0 as u16, 0b10101010_00000000); /// assert_eq!(m, Wrapping(-22016)); /// ``` - #[unstable(feature = "reverse_bits", issue = "48763")] + #[stable(feature = "reverse_bits", since = "1.37.0")] #[inline] #[must_use] pub const fn reverse_bits(self) -> Self { diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index 0dba2bed62c..5050842e409 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -24,7 +24,6 @@ #![feature(test)] #![feature(trusted_len)] #![feature(try_trait)] -#![feature(reverse_bits)] #![feature(inner_deref)] #![feature(slice_internals)] #![feature(slice_partition_dedup)] |