diff --git a/crates/ruff/src/resolver.rs b/crates/ruff/src/resolver.rs index 421aa309c2..6a166c83ab 100644 --- a/crates/ruff/src/resolver.rs +++ b/crates/ruff/src/resolver.rs @@ -127,7 +127,8 @@ pub fn resolve_configuration( } // Resolve the current path. - let options = pyproject::load_options(&path)?; + let options = pyproject::load_options(&path) + .map_err(|err| anyhow!("Failed to parse `{}`: {}", path.to_string_lossy(), err))?; let project_root = relativity.resolve(&path); let configuration = Configuration::from_options(options, &project_root)?; diff --git a/crates/ruff/src/settings/pyproject.rs b/crates/ruff/src/settings/pyproject.rs index bc810b8000..a2d5947c75 100644 --- a/crates/ruff/src/settings/pyproject.rs +++ b/crates/ruff/src/settings/pyproject.rs @@ -2,7 +2,7 @@ use std::path::{Path, PathBuf}; -use anyhow::{anyhow, Result}; +use anyhow::Result; use serde::{Deserialize, Serialize}; use crate::settings::options::Options; @@ -113,13 +113,7 @@ pub fn find_user_settings_toml() -> Option { /// Load `Options` from a `pyproject.toml` or `ruff.toml` file. pub fn load_options>(path: P) -> Result { if path.as_ref().ends_with("pyproject.toml") { - let pyproject = parse_pyproject_toml(&path).map_err(|err| { - anyhow!( - "Failed to parse `{}`: {}", - path.as_ref().to_string_lossy(), - err - ) - })?; + let pyproject = parse_pyproject_toml(&path)?; Ok(pyproject .tool .and_then(|tool| tool.ruff)