From 5aeddeb8252ec3fa7ec6e71c7c2e746cda37f846 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 5 Dec 2022 12:04:50 -0500 Subject: [PATCH] Include pyproject.toml path in error message (#1068) --- src/settings/configuration.rs | 2 +- src/settings/pyproject.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/settings/configuration.rs b/src/settings/configuration.rs index 2b2b7f5eba..3445d07387 100644 --- a/src/settings/configuration.rs +++ b/src/settings/configuration.rs @@ -84,7 +84,7 @@ impl Configuration { Ok(Configuration { dummy_variable_rgx: match options.dummy_variable_rgx { Some(pattern) => Regex::new(&pattern) - .map_err(|e| anyhow!("Invalid dummy-variable-rgx value: {e}"))?, + .map_err(|e| anyhow!("Invalid `dummy-variable-rgx` value: {e}"))?, None => DEFAULT_DUMMY_VARIABLE_RGX.clone(), }, src: options.src.map_or_else( diff --git a/src/settings/pyproject.rs b/src/settings/pyproject.rs index 7d00ce278c..c1ea704997 100644 --- a/src/settings/pyproject.rs +++ b/src/settings/pyproject.rs @@ -2,7 +2,7 @@ use std::path::{Path, PathBuf}; -use anyhow::Result; +use anyhow::{anyhow, Result}; use common_path::common_path_all; use log::debug; use path_absolutize::Absolutize; @@ -82,7 +82,8 @@ pub fn find_project_root(sources: &[PathBuf]) -> Option { pub fn load_options(pyproject: Option<&PathBuf>) -> Result { if let Some(pyproject) = pyproject { - Ok(parse_pyproject_toml(pyproject)? + Ok(parse_pyproject_toml(pyproject) + .map_err(|err| anyhow!("Failed to parse `{}`: {}", pyproject.to_string_lossy(), err))? .tool .and_then(|tool| tool.ruff) .unwrap_or_default())