Skip to content

Commit f809e71

Browse files
committed
Rollup merge of rust-lang#24212 - alexcrichton:destabilize-begin-unwind, r=huonw
Now that we have a `#[allow_internal_unstable]` attribute for macros there's no need for these two `begin_unwind` functions to be stable. Right now the `panic!` interface is the only one we wish to stabilize, so remove the stability markers from these functions. While this is a breaking change, it is highly unlikely to break any actual code. It is recommended to use the `panic!` macro instead if it breaks explicit calls into `std::rt`. [breaking-change] cc rust-lang#24208
2 parents 3b61868 + ec7c800 commit f809e71

File tree

794 files changed

+1
-795
lines changed

Some content is hidden

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

794 files changed

+1
-795
lines changed

src/libstd/macros.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
/// ```
3838
#[macro_export]
3939
#[stable(feature = "rust1", since = "1.0.0")]
40+
#[allow_internal_unstable]
4041
macro_rules! panic {
4142
() => ({
4243
panic!("explicit panic")

src/libstd/rt/unwind.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ pub extern fn rust_begin_unwind(msg: fmt::Arguments,
495495
/// on (e.g.) the inlining of other functions as possible), by moving
496496
/// the actual formatting into this shared place.
497497
#[inline(never)] #[cold]
498-
#[stable(since = "1.0.0", feature = "rust1")]
499498
pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, usize)) -> ! {
500499
use fmt::Write;
501500

@@ -511,7 +510,6 @@ pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, usize))
511510

512511
/// This is the entry point of unwinding for panic!() and assert!().
513512
#[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible
514-
#[stable(since = "1.0.0", feature = "rust1")]
515513
pub fn begin_unwind<M: Any + Send>(msg: M, file_line: &(&'static str, usize)) -> ! {
516514
// Note that this should be the only allocation performed in this code path.
517515
// Currently this means that panic!() on OOM will invoke this code path,
@@ -598,7 +596,6 @@ fn begin_unwind_inner(msg: Box<Any + Send>,
598596
/// Only a limited number of callbacks can be registered, and this function
599597
/// returns whether the callback was successfully registered or not. It is not
600598
/// currently possible to unregister a callback once it has been registered.
601-
#[unstable(feature = "std_misc")]
602599
pub unsafe fn register(f: Callback) -> bool {
603600
match CALLBACK_CNT.fetch_add(1, Ordering::SeqCst) {
604601
// The invocation code has knowledge of this window where the count has

src/test/run-pass-fulldeps/rename-directory.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// because it needs TempDir, which is in extra
1313

1414
// ignore-android
15-
// pretty-expanded FIXME #23616
1615

1716
#![feature(rustc_private, path_ext)]
1817

src/test/run-pass/argument-passing.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111

12-
// pretty-expanded FIXME #23616
1312

1413
struct X {
1514
x: isize

src/test/run-pass/arith-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111

1212

13-
// pretty-expanded FIXME #23616
1413

1514
pub fn main() {
1615
let i32_c: isize = 0x10101010;

src/test/run-pass/arith-unsigned.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
1211

1312
#![allow(type_limits)]
1413

src/test/run-pass/artificial-block.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
1211

1312
fn f() -> isize { { return 3; } }
1413

src/test/run-pass/as-precedence.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
1211

1312
fn main() {
1413
assert_eq!(3 as usize * 3, 9);

src/test/run-pass/asm-in-out-operand.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
1211

1312
#![feature(asm)]
1413

src/test/run-pass/asm-out-assign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
1211

1312
#![feature(asm)]
1413

0 commit comments

Comments
 (0)