Fixups for CI

crates/ruff_cli/src/args.rs

@@ -72,6 +72,7 @@ pub enum Command {
 
 // The `Parser` derive is for ruff_dev, for ruff_cli `Args` would be sufficient
 #[derive(Clone, Debug, clap::Parser)]
+#[allow(clippy::struct_excessive_bools)]
 pub struct CheckCommand {
     /// List of files or directories to check.
     pub files: Vec<PathBuf>,

crates/ruff_cli/src/commands/check_stdin.rs

@@ -30,7 +30,7 @@ pub(crate) fn check_stdin(
     let mut diagnostics = lint_stdin(
         filename,
         package_root,
-        stdin,
+        &stdin,
         &pyproject_config.settings,
         noqa,
         fix_mode,

crates/ruff_cli/src/diagnostics.rs

@@ -395,7 +395,7 @@ pub(crate) fn lint_path(
 pub(crate) fn lint_stdin(
     path: Option<&Path>,
     package: Option<&Path>,
-    contents: String,
+    contents: &str,
     settings: &Settings,
     noqa: flags::Noqa,
     fix_mode: flags::FixMode,
@@ -406,7 +406,7 @@ pub(crate) fn lint_stdin(
     };
 
     // Extract the sources from the file.
-    let source_kind = match SourceKind::from_source_code(contents.clone(), source_type) {
+    let source_kind = match SourceKind::from_source_code(contents.to_string(), source_type) {
         Ok(Some(source_kind)) => source_kind,
         Ok(None) => return Ok(Diagnostics::default()),
         Err(err) => {

crates/ruff_cli/src/printer.rs

@@ -184,7 +184,7 @@ impl Printer {
             }
             SerializationFormat::Text => {
                 TextEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables))
+                    .with_show_fix_status(show_fix_status(self.fix_mode, &fixables))
                     .with_show_fix_diff(self.flags.contains(Flags::SHOW_FIX_DIFF))
                     .with_show_source(self.flags.contains(Flags::SHOW_SOURCE))
                     .emit(writer, &diagnostics.messages, &context)?;
@@ -202,7 +202,7 @@ impl Printer {
             SerializationFormat::Grouped => {
                 GroupedEmitter::default()
                     .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables))
+                    .with_show_fix_status(show_fix_status(self.fix_mode, &fixables))
                     .emit(writer, &diagnostics.messages, &context)?;
 
                 if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
@@ -361,7 +361,7 @@ impl Printer {
 
             let context = EmitterContext::new(&diagnostics.notebook_indexes);
             TextEmitter::default()
-                .with_show_fix_status(show_fix_status(self.fix_mode, fixables))
+                .with_show_fix_status(show_fix_status(self.fix_mode, &fixables))
                 .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
                 .emit(writer, &diagnostics.messages, &context)?;
         }
@@ -385,7 +385,7 @@ fn num_digits(n: usize) -> usize {
 }
 
 /// Return `true` if the [`Printer`] should indicate that a rule is fixable.
-fn show_fix_status(fix_mode: flags::FixMode, fixables: FixableStatistics) -> bool {
+fn show_fix_status(fix_mode: flags::FixMode, fixables: &FixableStatistics) -> bool {
     // If we're in application mode, avoid indicating that a rule is fixable.
     // If the specific violation were truly fixable, it would've been fixed in
     // this pass! (We're occasionally unable to determine whether a specific

crates/ruff_cli/tests/integration_test.rs

@@ -799,7 +799,7 @@ fn check_input_from_argfile() -> Result<()> {
 }
 
 #[test]
-fn displays_fix_applicability_levels() -> Result<()> {
+fn displays_fix_applicability_levels() {
     // `--fix` should only apply automatic fixes, but should tell the user about `--fix --unautomatic` if
     // there are remaining unautomatic fixes.
     // TODO: this should be a failure but we don't have a way to track that
@@ -825,12 +825,10 @@ fn displays_fix_applicability_levels() -> Result<()> {
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }
 
 #[test]
-fn displays_remaining_suggested_fixes() -> Result<()> {
+fn displays_remaining_suggested_fixes() {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .args(["-", "--output-format", "text", "--no-cache", "--isolated", "--select", "F601"])
         .pass_stdin("x = {'a': 1, 'a': 1}\n"),
@@ -844,12 +842,10 @@ fn displays_remaining_suggested_fixes() -> Result<()> {
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }
 
 #[test]
-fn fix_applies_automatic_fixes_only() -> Result<()> {
+fn fix_applies_automatic_fixes_only() {
     // `--fix` should only apply automatic fixes. Since we're runnnig in `stdin` mode, output shouldn't
     // be printed.
     assert_cmd_snapshot!(
@@ -873,12 +869,10 @@ fn fix_applies_automatic_fixes_only() -> Result<()> {
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }
 
 #[test]
-fn fix_applies_automatic_and_suggested_fixes_with_fix_suggested() -> Result<()> {
+fn fix_applies_automatic_and_suggested_fixes_with_fix_suggested() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
             .args([
@@ -904,12 +898,10 @@ fn fix_applies_automatic_and_suggested_fixes_with_fix_suggested() -> Result<()>
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }
 
 #[test]
-fn diff_shows_automatic_and_suggested_fixes_with_fix_suggested() -> Result<()> {
+fn diff_shows_automatic_and_suggested_fixes_with_fix_suggested() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
             .args([
@@ -937,12 +929,10 @@ fn diff_shows_automatic_and_suggested_fixes_with_fix_suggested() -> Result<()> {
     ----- stderr -----
     "###
     );
-
-    Ok(())
 }
 
 #[test]
-fn diff_shows_automatic_fixes_only() -> Result<()> {
+fn diff_shows_automatic_fixes_only() {
     assert_cmd_snapshot!(
     Command::new(get_cargo_bin(BIN_NAME))
         .args([
@@ -968,12 +958,10 @@ fn diff_shows_automatic_fixes_only() -> Result<()> {
     ----- stderr -----
     "###
     );
-
-    Ok(())
 }
 
 #[test]
-fn fix_only_applies_automatic_and_suggested_fixes_with_fix_suggested() -> Result<()> {
+fn fix_only_applies_automatic_and_suggested_fixes_with_fix_suggested() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
         .args([
@@ -996,12 +984,10 @@ fn fix_only_applies_automatic_and_suggested_fixes_with_fix_suggested() -> Result
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }
 
 #[test]
-fn fix_only_applies_automatic_fixes_only() -> Result<()> {
+fn fix_only_applies_automatic_fixes_only() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
         .args([
@@ -1023,6 +1009,4 @@ fn fix_only_applies_automatic_fixes_only() -> Result<()> {
 
     ----- stderr -----
     "###);
-
-    Ok(())
 }