From bef34f3a69eef7e3dff5e3df4becdecb4fef60ae Mon Sep 17 00:00:00 2001
From: Brent Westbrook <brentrwestbrook@gmail.com>
Date: Thu, 29 Jan 2026 09:13:57 -0500
Subject: [PATCH 1/2] Remove hidden `--output-format` warning

Summary
--

I forgot to include this in #22908, but I think it's okay just to land this on
`main` instead of the release branch because the warning isn't actually visible
to users anyway, as reported in #19552. We're stabilizing `--output-format`
actually being used with `--watch`, so we can just delete this warning.

Fixes #19552
---
 crates/ruff/src/lib.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/crates/ruff/src/lib.rs b/crates/ruff/src/lib.rs
index f9ede09b7e6f07..9c33cf4fb21a30 100644
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -366,13 +366,6 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
     let preview = pyproject_config.settings.linter.preview.is_enabled();
 
     if cli.watch {
-        if output_format != OutputFormat::default() {
-            warn_user!(
-                "`--output-format {}` is always used in watch mode.",
-                OutputFormat::default()
-            );
-        }
-
         // Configure the file watcher.
         let (tx, rx) = channel();
         let mut watcher = recommended_watcher(tx)?;

From a8c27abc9c9fbce79d82c4cb400a1ca886c8478a Mon Sep 17 00:00:00 2001
From: Brent Westbrook <brentrwestbrook@gmail.com>
Date: Thu, 29 Jan 2026 09:43:50 -0500
Subject: [PATCH 2/2] clippy

---
 crates/ruff/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/ruff/src/lib.rs b/crates/ruff/src/lib.rs
index 9c33cf4fb21a30..c56514f869dca3 100644
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -17,7 +17,6 @@ use args::{GlobalConfigArgs, ServerCommand};
 use ruff_db::diagnostic::{Diagnostic, Severity};
 use ruff_linter::logging::{LogLevel, set_up_logging};
 use ruff_linter::settings::flags::FixMode;
-use ruff_linter::settings::types::OutputFormat;
 use ruff_linter::{fs, warn_user, warn_user_once};
 use ruff_workspace::Settings;