Explicitly set hidden options

Author: topecongiro

src/test/configuration_snippet.rs

@@ -280,9 +280,7 @@ fn get_code_blocks() -> Vec<ConfigCodeBlock> {
     }
 
     for name in hash_set {
-        if !Config::is_hidden_option(&name) {
-            panic!("{} does not have a configuration guide", name);
-        }
+        panic!("{} does not have a configuration guide", name);
     }
 
     code_blocks

src/test/mod.rs

@@ -6,15 +6,16 @@ use std::iter::Peekable;
 use std::mem;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use std::str::Chars;
+use std::str::{Chars, FromStr};
 use std::thread;
 
 use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
 use crate::formatting::{ReportedErrors, SourceFile};
-use crate::is_nightly_channel;
 use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter};
 use crate::source_file;
-use crate::{FormatReport, FormatReportFormatterBuilder, Input, Session};
+use crate::{
+    is_nightly_channel, FileLines, FormatReport, FormatReportFormatterBuilder, Input, Session,
+};
 
 mod configuration_snippet;
 
@@ -180,7 +181,7 @@ fn system_tests() {
     run_test_with(&TestSetting::default(), || {
         // Get all files in the tests/source directory.
         let files = get_test_files(Path::new("tests/source"), true);
-        let (_reports, count, fails) = check_files(files, &None);
+        let (_reports, count, fails) = check_files(files, &None, None);
 
         // Display results.
         println!("Ran {} system tests.", count);
@@ -199,7 +200,7 @@ fn system_tests() {
 fn coverage_tests() {
     init_log();
     let files = get_test_files(Path::new("tests/coverage/source"), true);
-    let (_reports, count, fails) = check_files(files, &None);
+    let (_reports, count, fails) = check_files(files, &None, Some(EmitMode::Coverage));
 
     println!("Ran {} tests in coverage mode.", count);
     assert_eq!(fails, 0, "{} tests failed", fails);
@@ -210,15 +211,23 @@ fn checkstyle_test() {
     init_log();
     let filename = "tests/writemode/source/fn-single-line.rs";
     let expected_filename = "tests/writemode/target/checkstyle.xml";
-    assert_output(Path::new(filename), Path::new(expected_filename));
+    assert_output(
+        Path::new(filename),
+        Path::new(expected_filename),
+        EmitMode::Checkstyle,
+    );
 }
 
 #[test]
 fn json_test() {
     init_log();
     let filename = "tests/writemode/source/json.rs";
     let expected_filename = "tests/writemode/target/output.json";
-    assert_output(Path::new(filename), Path::new(expected_filename));
+    assert_output(
+        Path::new(filename),
+        Path::new(expected_filename),
+        EmitMode::Json,
+    );
 }
 
 #[test]
@@ -230,9 +239,7 @@ fn modified_test() {
     let filename = "tests/writemode/source/modified.rs";
     let mut data = Vec::new();
     let mut config = Config::default();
-    config
-        .set()
-        .emit_mode(crate::config::EmitMode::ModifiedLines);
+    config.set_emit_mode(crate::config::EmitMode::ModifiedLines);
 
     {
         let mut session = Session::new(config, Some(&mut data));
@@ -281,8 +288,9 @@ fn modified_test() {
 
 // Helper function for comparing the results of rustfmt
 // to a known output file generated by one of the write modes.
-fn assert_output(source: &Path, expected_filename: &Path) {
-    let config = read_config(source);
+fn assert_output(source: &Path, expected_filename: &Path, emit_mode: EmitMode) {
+    let mut config = read_config(source);
+    config.set_emit_mode(emit_mode);
     let (_, source_file, _) = format_file(source, config.clone());
 
     // Populate output by writing to a vec.
@@ -317,7 +325,7 @@ fn idempotence_tests() {
         }
         // Get all files in the tests/target directory.
         let files = get_test_files(Path::new("tests/target"), true);
-        let (_reports, count, fails) = check_files(files, &None);
+        let (_reports, count, fails) = check_files(files, &None, None);
 
         // Display results.
         println!("Ran {} idempotent tests.", count);
@@ -349,7 +357,7 @@ fn self_tests() {
     }
     files.push(PathBuf::from("src/lib.rs"));
 
-    let (reports, count, fails) = check_files(files, &Some(PathBuf::from("rustfmt.toml")));
+    let (reports, count, fails) = check_files(files, &Some(PathBuf::from("rustfmt.toml")), None);
     let mut warnings = 0;
 
     // Display results.
@@ -376,7 +384,7 @@ fn stdin_formatting_smoke_test() {
     init_log();
     let input = Input::Text("fn main () {}".to_owned());
     let mut config = Config::default();
-    config.set().emit_mode(EmitMode::Stdout);
+    config.set_emit_mode(EmitMode::Stdout);
     let mut buf: Vec<u8> = vec![];
     {
         let mut session = Session::new(config, Some(&mut buf));
@@ -484,7 +492,11 @@ fn format_lines_errors_are_reported_with_tabs() {
 
 // For each file, run rustfmt and collect the output.
 // Returns the number of files checked and the number of failures.
-fn check_files(files: Vec<PathBuf>, opt_config: &Option<PathBuf>) -> (Vec<FormatReport>, u32, u32) {
+fn check_files(
+    files: Vec<PathBuf>,
+    opt_config: &Option<PathBuf>,
+    emit_mode: Option<EmitMode>,
+) -> (Vec<FormatReport>, u32, u32) {
     let mut count = 0;
     let mut fails = 0;
     let mut reports = vec![];
@@ -502,7 +514,7 @@ fn check_files(files: Vec<PathBuf>, opt_config: &Option<PathBuf>) -> (Vec<Format
 
         debug!("Testing '{}'...", file_name.display());
 
-        match idempotent_check(&file_name, &opt_config) {
+        match idempotent_check(&file_name, &opt_config, emit_mode) {
             Ok(ref report) if report.has_warnings() => {
                 print!("{}", FormatReportFormatterBuilder::new(&report).build());
                 fails += 1;
@@ -559,16 +571,22 @@ fn read_config(filename: &Path) -> Config {
     };
 
     for (key, val) in &sig_comments {
-        if key != "target" && key != "config" && key != "unstable" {
-            config.override_value(key, val);
-            if config.is_default(key) {
-                warn!("Default value {} used explicitly for {}", val, key);
+        match key.as_ref() {
+            "target" | "config" | "unstable" => continue,
+            "file_lines" => {
+                config.set_file_lines(FileLines::from_str(val).unwrap());
+            }
+            _ => {
+                config.override_value(key, val).unwrap();
+                if config.is_default(key) {
+                    warn!("Default value {} used explicitly for {}", val, key);
+                }
             }
         }
     }
 
     // Don't generate warnings for to-do items.
-    config.set().report_todo(ReportTactic::Never);
+    config.set_report_todo(ReportTactic::Never);
 
     config
 }
@@ -592,13 +610,17 @@ enum IdempotentCheckError {
 fn idempotent_check(
     filename: &PathBuf,
     opt_config: &Option<PathBuf>,
+    emit_mode: Option<EmitMode>,
 ) -> Result<FormatReport, IdempotentCheckError> {
     let sig_comments = read_significant_comments(filename);
-    let config = if let Some(ref config_file_path) = opt_config {
+    let mut config = if let Some(ref config_file_path) = opt_config {
         Config::from_toml_path(config_file_path).expect("`rustfmt.toml` not found")
     } else {
         read_config(filename)
     };
+    if let Some(emit_mode) = emit_mode {
+        config.set_emit_mode(emit_mode);
+    }
     let (parsing_errors, source_file, format_report) = format_file(filename, config);
     if parsing_errors {
         return Err(IdempotentCheckError::Parse);

tests/coverage/source/comments.rs

@@ -1,4 +1,3 @@
-// rustfmt-emit_mode: coverage
 /// Here's a doc comment!
 fn main() {
     // foo is bar

tests/coverage/target/comments.rs

@@ -1,4 +1,3 @@
-XX XXXXXXXXXXXXXXXXXX XXXXXXXX
 /// Here's a doc comment!
 fn main() {
     XX XXX XX XXX

tests/writemode/source/fn-single-line.rs

@@ -1,5 +1,4 @@
 // rustfmt-fn_single_line: true
-// rustfmt-emit_mode: checkstyle
 // Test single-line functions.
 
 fn foo_expr() {

tests/writemode/source/json.rs

@@ -1,5 +1,4 @@
 // rustfmt-fn_single_line: true
-// rustfmt-emit_mode: json
 // Test single-line functions.
 
 fn foo_expr() {