language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 21:05:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use Settings where AllSettings isn't required (#7518)

Browse source
This commit is contained in:
Micha Reiser 2023-09-19 23:16:20 +02:00 • committed by GitHub
parent 511cc25fc4
commit 297ec2c2d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ruff_cli/src/commands/check.rs
View file

@ -15,7 +15,7 @@ use rustc_hash::FxHashMap;
use ruff::message::Message;
use ruff::registry::Rule;
use ruff::settings::{flags, AllSettings};
use ruff::settings::{flags, Settings};
use ruff::{fs, warn_user_once, IOError};
use ruff_diagnostics::Diagnostic;
use ruff_python_ast::imports::ImportMap;
@ -111,7 +111,7 @@ pub(crate) fn check(
.and_then(|parent| package_roots.get(parent))
.and_then(|package| *package);
let settings = resolver.resolve_all(path, pyproject_config);
let settings = resolver.resolve(path, pyproject_config);
let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
let cache = caches.as_ref().and_then(|caches| {
@ -199,7 +199,7 @@ pub(crate) fn check(
fn lint_path(
path: &Path,
package: Option<&Path>,
settings: &AllSettings,
settings: &Settings,
cache: Option<&Cache>,
noqa: flags::Noqa,
autofix: flags::FixMode,