Review

Cargo.toml

@@ -21,7 +21,7 @@ filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
-insta = { version = "1.31.0" }
+insta = { version = "1.31.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 log = { version = "0.4.17" }

crates/ruff/src/pyproject_toml.rs

@@ -1,3 +1,5 @@
+use colored::Colorize;
+use log::warn;
 use pyproject_toml::{BuildSystem, Project};
 use ruff_text_size::{TextRange, TextSize};
 use serde::{Deserialize, Serialize};
@@ -26,28 +28,33 @@ pub fn lint_pyproject_toml(source_file: SourceFile, settings: &Settings) -> Vec<
         return Vec::default();
     };
 
-    let mut messages = vec![];
+    let mut messages = Vec::new();
     let range = match err.span() {
         // This is bad but sometimes toml and/or serde just don't give us spans
         // TODO(konstin,micha): https://github.com/astral-sh/ruff/issues/4571
         None => TextRange::default(),
         Some(range) => {
             let Ok(end) = TextSize::try_from(range.end) else {
-                return if settings.rules.enabled(Rule::IOError) {
-                    let message = format!(
-                        "{} is larger than 4GB, but ruff assumes all files to be smaller",
-                        source_file.name(),
-                    );
+                let message = format!(
+                    "{} is larger than 4GB, but ruff assumes all files to be smaller",
+                    source_file.name(),
+                );
+                if settings.rules.enabled(Rule::IOError) {
                     let diagnostic = Diagnostic::new(IOError { message }, TextRange::default());
                     messages.push(Message::from_diagnostic(
                         diagnostic,
                         source_file,
                         TextSize::default(),
                     ));
-                    messages
                 } else {
-                    Vec::new()
-                };
+                    warn!(
+                        "{}{}{} {message}",
+                        "Failed to lint ".bold(),
+                        source_file.name().bold(),
+                        ":".bold()
+                    );
+                }
+                return messages;
             };
             TextRange::new(
                 // start <= end, so if end < 4GB follows start < 4GB

crates/ruff_cli/Cargo.toml

@@ -64,7 +64,7 @@ wild = { version = "2" }
 
 [dev-dependencies]
 assert_cmd = { version = "2.0.8" }
-insta = { workspace = true }
+insta = { workspace = true, features = ["filters"] }
 tempfile = "3.6.0"
 ureq = { version = "2.6.2", features = [] }
 

crates/ruff_cli/src/commands/run.rs

@@ -143,12 +143,6 @@ pub(crate) fn run(
             }
             .unwrap_or_else(|(path, message)| {
                 if let Some(path) = &path {
-                    error!(
-                        "{}{}{} {message}",
-                        "Failed to lint ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    );
                     let settings = resolver.resolve(path, pyproject_config);
                     if settings.rules.enabled(Rule::IOError) {
                         let dummy =
@@ -163,10 +157,16 @@ pub(crate) fn run(
                             ImportMap::default(),
                         )
                     } else {
+                        warn!(
+                            "{}{}{} {message}",
+                            "Failed to lint ".bold(),
+                            fs::relativize_path(path).bold(),
+                            ":".bold()
+                        );
                         Diagnostics::default()
                     }
                 } else {
-                    error!("{} {message}", "Encountered error:".bold());
+                    warn!("{} {message}", "Encountered error:".bold());
                     Diagnostics::default()
                 }
             })
@@ -228,7 +228,7 @@ with the relevant file contents, the `pyproject.toml` settings, and the followin
 }
 
 #[cfg(test)]
-#[cfg(unix)] // Remove when adding a second test
+#[cfg(unix)] // If you need to add a second test, move this cfg
 mod test {
     use super::run;
     use crate::args::Overrides;
@@ -294,12 +294,15 @@ mod test {
             )
             .unwrap();
 
-        // Remove the tempdir from the messages
-        let messages = String::from_utf8(output)
-            .unwrap()
-            .replace(tempdir.path().to_str().unwrap(), "");
+        let messages = String::from_utf8(output).unwrap();
 
-        insta::with_settings!({ omit_expression => true }, {
+        insta::with_settings!({
+            omit_expression => true,
+            filters => vec![
+                // The tempdir is always different (and platform dependent)
+                (tempdir.path().to_str().unwrap(), "/home/ferris/project"),
+            ]
+        }, {
             insta::assert_snapshot!(snapshot, messages);
         });
         Ok(())

crates/ruff_cli/src/commands/snapshots/ruff_cli__commands__run__test__E902_E902.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_cli/src/commands/run.rs
 ---
-/code.py:1:1: E902 Permission denied (os error 13)
-/notebook.ipynb:1:1: E902 Permission denied (os error 13)
-/pyproject.toml:1:1: E902 Permission denied (os error 13)
+/home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
+/home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
+/home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
 

crates/ruff_cli/src/diagnostics.rs

@@ -8,7 +8,7 @@ use std::path::Path;
 
 use anyhow::{anyhow, Result};
 use colored::Colorize;
-use log::{debug, error};
+use log::{debug, error, warn};
 use ruff_text_size::{TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use similar::TextDiff;
@@ -18,6 +18,7 @@ use ruff::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult};
 use ruff::logging::DisplayParseError;
 use ruff::message::Message;
 use ruff::pyproject_toml::lint_pyproject_toml;
+use ruff::registry::Rule;
 use ruff::settings::{flags, AllSettings, Settings};
 use ruff::source_kind::SourceKind;
 use ruff::{fs, IOError};
@@ -130,17 +131,27 @@ pub(crate) fn lint_path(
 
     // In case of an io error we want to exit early
     let io_error_diagnostics = |err: io::Error, path: &Path| -> Diagnostics {
-        let io_err = Diagnostic::new(
-            IOError {
-                message: err.to_string(),
-            },
-            TextRange::default(),
-        );
-        let dummy = SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
-        Diagnostics::new(
-            vec![Message::from_diagnostic(io_err, dummy, TextSize::default())],
-            ImportMap::default(),
-        )
+        if settings.lib.rules.enabled(Rule::IOError) {
+            let io_err = Diagnostic::new(
+                IOError {
+                    message: err.to_string(),
+                },
+                TextRange::default(),
+            );
+            let dummy = SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
+            Diagnostics::new(
+                vec![Message::from_diagnostic(io_err, dummy, TextSize::default())],
+                ImportMap::default(),
+            )
+        } else {
+            warn!(
+                "{}{}{} {err}",
+                "Failed to lint ".bold(),
+                fs::relativize_path(path).bold(),
+                ":".bold()
+            );
+            Diagnostics::default()
+        }
     };
 
     // We have to special case this here since the Python tokenizer doesn't work with TOML.

crates/ruff_cli/tests/integration_test.rs

@@ -3,7 +3,9 @@
 #[cfg(unix)]
 use std::fs;
 #[cfg(unix)]
-use std::os::unix::fs::OpenOptionsExt;
+use std::fs::Permissions;
+#[cfg(unix)]
+use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
 #[cfg(unix)]
 use std::path::Path;
 use std::str;
@@ -317,3 +319,29 @@ fn unreadable_pyproject_toml() -> Result<()> {
     );
     Ok(())
 }
+
+/// Check the output with an unreadable directory
+#[cfg(unix)]
+#[test]
+fn unreadable_dir() -> Result<()> {
+    // Create a directory with 000 (not iterable/readable) permissions
+    let tempdir = TempDir::new()?;
+    let unreadable_dir = tempdir.path().join("unreadable_dir");
+    fs::create_dir(&unreadable_dir)?;
+    fs::set_permissions(&unreadable_dir, Permissions::from_mode(0o000))?;
+
+    // We (currently?) have to use a subcommand to check exit status (currently wrong) and logging
+    // output
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+    let output = cmd
+        .args(["--no-cache", "--isolated"])
+        .arg(&unreadable_dir)
+        .assert()
+        // TODO(konstin): This should be a failure, but we currently can't track that
+        .success();
+    assert_eq!(
+        str::from_utf8(&output.get_output().stderr)?,
+        "warning: Encountered error: Permission denied (os error 13)\n"
+    );
+    Ok(())
+}