From e2fd2dffde52a59f7d59d67460aeb2ebf33f77dd Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 27 Mar 2015 16:25:49 -0700 Subject: std: Don't deadlock/panic on recursive prints Previously a panic was generated for recursive prints due to a double-borrow of a `RefCell`. This was solved by the second borrow's output being directed towards the global stdout instead of the per-thread stdout (still experimental functionality). After this functionality was altered, however, recursive prints still deadlocked due to the overridden `write_fmt` method which locked itself first and then wrote all the data. This was fixed by removing the override of the `write_fmt` method. This means that unlocked usage of `write!` on a `Stdout`/`Stderr` may be slower due to acquiring more locks, but it's easy to make more performant with a call to `.lock()`. Closes #23781 --- src/libstd/lib.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libstd/lib.rs') diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8de6e5257ec..5f5f2fed567 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -127,6 +127,7 @@ #![feature(str_char)] #![feature(into_cow)] #![feature(slice_patterns)] +#![feature(std_misc)] #![cfg_attr(test, feature(test, rustc_private, std_misc))] // Don't link to std. We are std. -- cgit 1.4.1-3-g733a5