about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCaleb Cartwright <caleb.cartwright@outlook.com>2021-10-13 21:22:34 -0500
committerCaleb Cartwright <calebcartwright@users.noreply.github.com>2021-10-13 21:58:13 -0500
commitc9c1932be3299b40eab63106deeb5d5ad2283b61 (patch)
treebb11bfe9855252aae1cda26194161b948ebeaa51 /src
parentf2fb3c9659e072d7df6315906f1adbd06c3bc9e3 (diff)
downloadrust-c9c1932be3299b40eab63106deeb5d5ad2283b61.tar.gz
rust-c9c1932be3299b40eab63106deeb5d5ad2283b61.zip
feat: stabilize disable_all_formatting
Diffstat (limited to 'src')
-rw-r--r--src/config/mod.rs2
-rw-r--r--src/test/mod.rs5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 398a1814d8d..c5419d860c9 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -155,7 +155,7 @@ create_config! {
         "Require a specific version of rustfmt";
     unstable_features: bool, false, false,
             "Enables unstable features. Only available on nightly channel";
-    disable_all_formatting: bool, false, false, "Don't reformat anything";
+    disable_all_formatting: bool, false, true, "Don't reformat anything";
     skip_children: bool, false, false, "Don't reformat out of line modules";
     hide_parse_errors: bool, false, false, "Hide errors from the parser";
     error_on_line_overflow: bool, false, false, "Error if unable to get all lines within max_width";
diff --git a/src/test/mod.rs b/src/test/mod.rs
index ece1b91bfd7..48d61289a9b 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -469,11 +469,6 @@ fn stdin_works_with_modified_lines() {
 #[test]
 fn stdin_disable_all_formatting_test() {
     init_log();
-    match option_env!("CFG_RELEASE_CHANNEL") {
-        None | Some("nightly") => {}
-        // These tests require nightly.
-        _ => return,
-    }
     let input = String::from("fn main() { println!(\"This should not be formatted.\"); }");
     let mut child = Command::new(rustfmt().to_str().unwrap())
         .stdin(Stdio::piped())