From bbeda1a8ab9d2a87b285938ee32304f63721ba38 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 4 Sep 2023 22:28:41 +0100 Subject: [PATCH] Remove output-file and target-version from formatter CLI --- crates/ruff_cli/src/args.rs | 9 --------- crates/ruff_cli/src/commands/format.rs | 15 ++++----------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/crates/ruff_cli/src/args.rs b/crates/ruff_cli/src/args.rs index 50cb562c1d..dd039f7403 100644 --- a/crates/ruff_cli/src/args.rs +++ b/crates/ruff_cli/src/args.rs @@ -338,12 +338,6 @@ pub struct FormatCommand { /// files would have been modified, and zero otherwise. #[arg(long)] pub check: bool, - /// Specify file to write the formatter output to (default: stdout). - #[arg(short, long)] - pub output_file: Option, - /// The minimum Python version that should be supported. - #[arg(long, value_enum)] - pub target_version: Option, /// Path to the `pyproject.toml` or `ruff.toml` file to use for configuration. #[arg(long, conflicts_with = "isolated")] pub config: Option, @@ -494,7 +488,6 @@ impl FormatCommand { config: self.config, files: self.files, isolated: self.isolated, - output_file: self.output_file, stdin_filename: self.stdin_filename, }, Overrides { @@ -504,7 +497,6 @@ impl FormatCommand { self.no_respect_gitignore, ), force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude), - target_version: self.target_version, // Unsupported on the formatter CLI, but required on `Overrides`. ..Overrides::default() }, @@ -556,7 +548,6 @@ pub struct FormatArguments { pub config: Option, pub files: Vec, pub isolated: bool, - pub output_file: Option, pub stdin_filename: Option, } diff --git a/crates/ruff_cli/src/commands/format.rs b/crates/ruff_cli/src/commands/format.rs index d2383f17ce..9fa3341548 100644 --- a/crates/ruff_cli/src/commands/format.rs +++ b/crates/ruff_cli/src/commands/format.rs @@ -1,7 +1,5 @@ use std::fmt::{Display, Formatter}; -use std::fs::File; use std::io; -use std::io::{BufWriter, Write}; use std::num::NonZeroU16; use std::path::{Path, PathBuf}; use std::time::Instant; @@ -98,15 +96,10 @@ pub(crate) fn format( // Report on the formatting changes. if log_level >= LogLevel::Default { - let mut writer: Box = match &cli.output_file { - Some(path) => { - colored::control::set_override(false); - let file = File::create(path)?; - Box::new(BufWriter::new(file)) - } - _ => Box::new(BufWriter::new(io::stdout())), - }; - writeln!(writer, "{summary}")?; + #[allow(clippy::print_stdout)] + { + println!("{summary}"); + } } match mode {