about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorRuben Schmidmeister <ruben.schmidmeister@icloud.com>2019-06-12 23:59:20 +0200
committerSeiichi Uchida <seuchida@gmail.com>2019-06-13 06:59:20 +0900
commitdbac28b4b4f2adb135104593365943b3eab24685 (patch)
tree84548be52c25f7c4af5cfb1f073b412caee468ce /src/test
parent1cea171cef198cf371a2f6d9182bc44a1a549e56 (diff)
Use trait to abstract emit modes (#3616)
Diffstat (limited to 'src/test')
-rw-r--r--src/test/mod.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/mod.rs b/src/test/mod.rs
index 96f6f2ce9ba..2830f9aeff1 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -9,7 +9,7 @@ use std::process::{Command, Stdio};
 use std::str::Chars;
 use std::thread;
 
-use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
+use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic, Verbosity};
 use crate::formatting::{ReportedErrors, SourceFile};
 use crate::is_nightly_channel;
 use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter};
@@ -344,9 +344,9 @@ fn stdin_formatting_smoke_test() {
     }
 
     #[cfg(not(windows))]
-    assert_eq!(buf, "fn main() {}\n".as_bytes());
+    assert_eq!(buf, "stdin:\n\nfn main() {}\n".as_bytes());
     #[cfg(windows)]
-    assert_eq!(buf, "fn main() {}\r\n".as_bytes());
+    assert_eq!(buf, "stdin:\n\nfn main() {}\r\n".as_bytes());
 }
 
 #[test]
@@ -838,6 +838,7 @@ impl ConfigCodeBlock {
 
     fn get_block_config(&self) -> Config {
         let mut config = Config::default();
+        config.set().verbose(Verbosity::Quiet);
         if self.config_name.is_some() && self.config_value.is_some() {
             config.override_value(
                 self.config_name.as_ref().unwrap(),