Use re-exports from test_internals.

Author: Sinan Nalkaya

library/std/src/io/stdio.rs

@@ -1287,4 +1287,4 @@ pub fn _eprint(args: fmt::Arguments<'_>) {
 }
 
 #[cfg(test)]
-pub use realstd::io::{_eprint, _print};
+pub use realstd::test_internals::{_eprint, _print};

library/std/src/panicking.rs

@@ -14,7 +14,7 @@ use core::panic::{Location, PanicPayload};
 // make sure to use the stderr output configured
 // by libtest in the real copy of std
 #[cfg(test)]
-use realstd::io::try_set_output_capture;
+use realstd::test_internals::try_set_output_capture;
 
 use crate::any::Any;
 #[cfg(not(test))]
@@ -487,7 +487,7 @@ pub mod panic_count {
 }
 
 #[cfg(test)]
-pub use realstd::rt::panic_count;
+pub use realstd::test_internals::panic_count;
 
 /// Invoke a closure, capturing the cause of an unwinding panic if one occurs.
 #[cfg(panic = "immediate-abort")]

library/std/src/test_internals.rs

@@ -1,4 +1,6 @@
 /// A collection of common re-exports to be used by the test version of this crate.
+pub use crate::io::{_eprint, _print, try_set_output_capture};
+pub use crate::rt::panic_count;
 pub use crate::thread::current::CURRENT as CURRENT_THREAD;
 
 cfg_select! {