Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 885c7df

Browse files
committedJun 1, 2019
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
2 parents 8b40a18 + 23de376 commit 885c7df

File tree

106 files changed

+295
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+295
-364
lines changed
 

‎src/libcore/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
#![feature(const_str_len)]
121121
#![feature(const_int_conversion)]
122122
#![feature(const_transmute)]
123-
#![feature(reverse_bits)]
124123
#![feature(non_exhaustive)]
125124
#![feature(structural_match)]
126125
#![feature(abi_unadjusted)]

‎src/libcore/num/mod.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -463,15 +463,12 @@ assert_eq!(m, ", $swapped, ");
463463
Basic usage:
464464
465465
```
466-
#![feature(reverse_bits)]
467-
468466
let n = ", $swap_op, stringify!($SelfT), ";
469467
let m = n.reverse_bits();
470468
471469
assert_eq!(m, ", $reversed, ");
472470
```"),
473-
#[unstable(feature = "reverse_bits", issue = "48763")]
474-
#[rustc_const_unstable(feature = "const_int_conversion")]
471+
#[stable(feature = "reverse_bits", since = "1.37.0")]
475472
#[inline]
476473
#[must_use]
477474
pub const fn reverse_bits(self) -> Self {
@@ -2514,14 +2511,12 @@ assert_eq!(m, ", $swapped, ");
25142511
Basic usage:
25152512
25162513
```
2517-
#![feature(reverse_bits)]
2518-
25192514
let n = ", $swap_op, stringify!($SelfT), ";
25202515
let m = n.reverse_bits();
25212516
25222517
assert_eq!(m, ", $reversed, ");
25232518
```"),
2524-
#[unstable(feature = "reverse_bits", issue = "48763")]
2519+
#[stable(feature = "reverse_bits", since = "1.37.0")]
25252520
#[inline]
25262521
#[must_use]
25272522
pub const fn reverse_bits(self) -> Self {

0 commit comments

Comments
 (0)