Skip to content

Commit c9a2621

Browse files
committed
debug
1 parent 197fb6a commit c9a2621

File tree

5 files changed

+1
-362
lines changed

5 files changed

+1
-362
lines changed

src/libstd/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,6 @@
224224
// obviously, if the user has disabled jemalloc in `./configure`).
225225
#![cfg_attr(any(stage0, feature = "force_alloc_system"), feature(alloc_system))]
226226

227-
// Turn warnings into errors, but only after stage0, where it can be useful for
228-
// code to emit warnings during language transitions
229-
#![deny(warnings)]
230-
231227
// std may use features in a platform-specific way
232228
#![allow(unused_features)]
233229

src/libstd/panicking.rs

+1-24
Original file line numberDiff line numberDiff line change
@@ -314,19 +314,6 @@ fn default_hook(info: &PanicInfo) {
314314
#[cfg(feature = "backtrace")]
315315
use sys_common::backtrace;
316316

317-
// If this is a double panic, make sure that we print a backtrace
318-
// for this panic. Otherwise only print it if logging is enabled.
319-
#[cfg(feature = "backtrace")]
320-
let log_backtrace = {
321-
let panics = update_panic_count(0);
322-
323-
if panics >= 2 {
324-
Some(backtrace::PrintFormat::Full)
325-
} else {
326-
backtrace::log_enabled()
327-
}
328-
};
329-
330317
let file = info.location.file;
331318
let line = info.location.line;
332319

@@ -346,17 +333,7 @@ fn default_hook(info: &PanicInfo) {
346333
name, msg, file, line);
347334

348335
#[cfg(feature = "backtrace")]
349-
{
350-
use sync::atomic::{AtomicBool, Ordering};
351-
352-
static FIRST_PANIC: AtomicBool = AtomicBool::new(true);
353-
354-
if let Some(format) = log_backtrace {
355-
let _ = backtrace::print(err, format);
356-
} else if FIRST_PANIC.compare_and_swap(true, false, Ordering::SeqCst) {
357-
let _ = writeln!(err, "note: Run with `RUST_BACKTRACE=1` for a backtrace.");
358-
}
359-
}
336+
let _ = backtrace::print(err, backtrace::PrintFormat::Full);
360337
};
361338

362339
let prev = LOCAL_STDERR.with(|s| s.borrow_mut().take());

src/test/run-pass/backtrace-debuginfo.rs

-174
This file was deleted.

src/test/run-pass/backtrace.rs

-116
This file was deleted.

src/test/run-pass/multi-panic.rs

-44
This file was deleted.

0 commit comments

Comments
 (0)