Rollup merge of #67531 - RalfJung:tame-promotion, r=nikomatsakis

[rust.git] / src / libtest / formatters / mod.rs

diff --git a/src/libtest/formatters/mod.rs b/src/libtest/formatters/mod.rs
index dd202fb3ab6faa0536b4843d7c4d2a6f9b8855f6..a64c0fc263d808fa0a366e497bf96a29f808484d 100644 (file)
--- a/src/libtest/formatters/mod.rs
+++ b/src/libtest/formatters/mod.rs
@@ -1,11 +1,18 @@
-use super::*;
+use std::{io, io::prelude::Write};
+
+use crate::{
+    console::ConsoleTestState,
+    test_result::TestResult,
+    time,
+    types::{TestDesc, TestName},
+};
 
-mod pretty;
 mod json;
+mod pretty;
 mod terse;
 
-pub(crate) use self::pretty::PrettyFormatter;
 pub(crate) use self::json::JsonFormatter;
+pub(crate) use self::pretty::PrettyFormatter;
 pub(crate) use self::terse::TerseFormatter;
 
 pub(crate) trait OutputFormatter {
@@ -16,7 +23,7 @@ fn write_result(
         &mut self,
         desc: &TestDesc,
         result: &TestResult,
-        exec_time: Option<&TestExecTime>,
+        exec_time: Option<&time::TestExecTime>,
         stdout: &[u8],
         state: &ConsoleTestState,
     ) -> io::Result<()>;