From aff7bd66e8b97a41d34c221007e12e4bbe535322 Mon Sep 17 00:00:00 2001 From: Mara Bos Date: Wed, 4 Nov 2020 00:11:14 +0100 Subject: Merge set_panic and set_print into set_output_capture. There were no use cases for setting them separately. Merging them simplifies some things. --- .../unstable-book/src/library-features/internal-output-capture.md | 5 +++++ src/doc/unstable-book/src/library-features/libstd-io-internals.md | 5 ----- src/doc/unstable-book/src/library-features/set-stdio.md | 5 ----- src/test/ui/panic-while-printing.rs | 6 +++--- src/test/ui/threads-sendsync/task-stderr.rs | 4 ++-- 5 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 src/doc/unstable-book/src/library-features/internal-output-capture.md delete mode 100644 src/doc/unstable-book/src/library-features/libstd-io-internals.md delete mode 100644 src/doc/unstable-book/src/library-features/set-stdio.md (limited to 'src') diff --git a/src/doc/unstable-book/src/library-features/internal-output-capture.md b/src/doc/unstable-book/src/library-features/internal-output-capture.md new file mode 100644 index 00000000000..7e1241fce98 --- /dev/null +++ b/src/doc/unstable-book/src/library-features/internal-output-capture.md @@ -0,0 +1,5 @@ +# `internal_output_capture` + +This feature is internal to the Rust compiler and is not intended for general use. + +------------------------ diff --git a/src/doc/unstable-book/src/library-features/libstd-io-internals.md b/src/doc/unstable-book/src/library-features/libstd-io-internals.md deleted file mode 100644 index 8bcc2769db7..00000000000 --- a/src/doc/unstable-book/src/library-features/libstd-io-internals.md +++ /dev/null @@ -1,5 +0,0 @@ -# `libstd_io_internals` - -This feature is internal to the Rust compiler and is not intended for general use. - ------------------------- diff --git a/src/doc/unstable-book/src/library-features/set-stdio.md b/src/doc/unstable-book/src/library-features/set-stdio.md deleted file mode 100644 index 7dbdcdaa1a2..00000000000 --- a/src/doc/unstable-book/src/library-features/set-stdio.md +++ /dev/null @@ -1,5 +0,0 @@ -# `set_stdio` - -This feature is internal to the Rust compiler and is not intended for general use. - ------------------------- diff --git a/src/test/ui/panic-while-printing.rs b/src/test/ui/panic-while-printing.rs index fa740c5baa8..96b35e45535 100644 --- a/src/test/ui/panic-while-printing.rs +++ b/src/test/ui/panic-while-printing.rs @@ -1,11 +1,11 @@ // run-pass // ignore-emscripten no subprocess support -#![feature(set_stdio)] +#![feature(internal_output_capture)] use std::fmt; use std::fmt::{Display, Formatter}; -use std::io::set_panic; +use std::io::set_output_capture; use std::sync::{Arc, Mutex}; pub struct A; @@ -17,7 +17,7 @@ impl Display for A { } fn main() { - set_panic(Some(Arc::new(Mutex::new(Vec::new())))); + set_output_capture(Some(Arc::new(Mutex::new(Vec::new())))); assert!(std::panic::catch_unwind(|| { eprintln!("{}", A); }) diff --git a/src/test/ui/threads-sendsync/task-stderr.rs b/src/test/ui/threads-sendsync/task-stderr.rs index 8bd78158b54..78145e337da 100644 --- a/src/test/ui/threads-sendsync/task-stderr.rs +++ b/src/test/ui/threads-sendsync/task-stderr.rs @@ -1,7 +1,7 @@ // run-pass // ignore-emscripten no threads support -#![feature(set_stdio)] +#![feature(internal_output_capture)] use std::io; use std::str; @@ -13,7 +13,7 @@ fn main() { let res = thread::Builder::new().spawn({ let data = data.clone(); move || { - io::set_panic(Some(data)); + io::set_output_capture(Some(data)); panic!("Hello, world!") } }).unwrap().join(); -- cgit 1.4.1-3-g733a5