mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-01 14:21:53 +00:00
Remove warn_on checks (#812)
This commit is contained in:
parent
0fe2b15676
commit
437b6f23b9
2 changed files with 1 additions and 78 deletions
61
src/cli.rs
61
src/cli.rs
|
@ -1,15 +1,12 @@
|
||||||
use std::fmt;
|
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use clap::{command, Parser};
|
use clap::{command, Parser};
|
||||||
use fnv::FnvHashMap;
|
use fnv::FnvHashMap;
|
||||||
use log::warn;
|
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
|
|
||||||
use crate::checks_gen::CheckCodePrefix;
|
use crate::checks_gen::CheckCodePrefix;
|
||||||
use crate::logging::LogLevel;
|
use crate::logging::LogLevel;
|
||||||
use crate::printer::SerializationFormat;
|
use crate::printer::SerializationFormat;
|
||||||
use crate::settings::configuration::Configuration;
|
|
||||||
use crate::settings::types::{PatternPrefixPair, PerFileIgnore, PythonVersion};
|
use crate::settings::types::{PatternPrefixPair, PerFileIgnore, PythonVersion};
|
||||||
|
|
||||||
#[derive(Debug, Parser)]
|
#[derive(Debug, Parser)]
|
||||||
|
@ -137,64 +134,6 @@ pub fn extract_log_level(cli: &Cli) -> LogLevel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum Warnable {
|
|
||||||
Select,
|
|
||||||
ExtendSelect,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for Warnable {
|
|
||||||
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
Warnable::Select => fmt.write_str("--select"),
|
|
||||||
Warnable::ExtendSelect => fmt.write_str("--extend-select"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Warn the user if they attempt to enable a code that won't be respected.
|
|
||||||
pub fn warn_on(
|
|
||||||
flag: Warnable,
|
|
||||||
codes: &[CheckCodePrefix],
|
|
||||||
cli_ignore: &[CheckCodePrefix],
|
|
||||||
cli_extend_ignore: &[CheckCodePrefix],
|
|
||||||
pyproject_configuration: &Configuration,
|
|
||||||
pyproject_path: Option<&PathBuf>,
|
|
||||||
) {
|
|
||||||
for code in codes {
|
|
||||||
if !cli_ignore.is_empty() {
|
|
||||||
if cli_ignore.contains(code) {
|
|
||||||
warn!("{code:?} was passed to {flag}, but ignored via --ignore")
|
|
||||||
}
|
|
||||||
} else if pyproject_configuration.ignore.contains(code) {
|
|
||||||
if let Some(path) = pyproject_path {
|
|
||||||
warn!(
|
|
||||||
"{code:?} was passed to {flag}, but ignored by the `ignore` field in {}",
|
|
||||||
path.to_string_lossy()
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
warn!("{code:?} was passed to {flag}, but ignored by the default `ignore` field",)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !cli_extend_ignore.is_empty() {
|
|
||||||
if cli_extend_ignore.contains(code) {
|
|
||||||
warn!("{code:?} was passed to {flag}, but ignored via --extend-ignore")
|
|
||||||
}
|
|
||||||
} else if pyproject_configuration.extend_ignore.contains(code) {
|
|
||||||
if let Some(path) = pyproject_path {
|
|
||||||
warn!(
|
|
||||||
"{code:?} was passed to {flag}, but ignored by the `extend_ignore` field in {}",
|
|
||||||
path.to_string_lossy()
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
warn!(
|
|
||||||
"{code:?} was passed to {flag}, but ignored by the default `extend_ignore` \
|
|
||||||
field"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Convert a list of `PatternPrefixPair` structs to `PerFileIgnore`.
|
/// Convert a list of `PatternPrefixPair` structs to `PerFileIgnore`.
|
||||||
pub fn collect_per_file_ignores(
|
pub fn collect_per_file_ignores(
|
||||||
pairs: Vec<PatternPrefixPair>,
|
pairs: Vec<PatternPrefixPair>,
|
||||||
|
|
18
src/main.rs
18
src/main.rs
|
@ -7,7 +7,7 @@ use std::time::Instant;
|
||||||
#[cfg(not(target_family = "wasm"))]
|
#[cfg(not(target_family = "wasm"))]
|
||||||
use ::ruff::cache;
|
use ::ruff::cache;
|
||||||
use ::ruff::checks::{CheckCode, CheckKind};
|
use ::ruff::checks::{CheckCode, CheckKind};
|
||||||
use ::ruff::cli::{collect_per_file_ignores, extract_log_level, warn_on, Cli, Warnable};
|
use ::ruff::cli::{collect_per_file_ignores, extract_log_level, Cli};
|
||||||
use ::ruff::fs::iter_python_files;
|
use ::ruff::fs::iter_python_files;
|
||||||
use ::ruff::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin};
|
use ::ruff::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin};
|
||||||
use ::ruff::logging::{set_up_logging, LogLevel};
|
use ::ruff::logging::{set_up_logging, LogLevel};
|
||||||
|
@ -240,25 +240,9 @@ fn inner_main() -> Result<ExitCode> {
|
||||||
collect_per_file_ignores(cli.per_file_ignores, project_root.as_ref());
|
collect_per_file_ignores(cli.per_file_ignores, project_root.as_ref());
|
||||||
}
|
}
|
||||||
if !cli.select.is_empty() {
|
if !cli.select.is_empty() {
|
||||||
warn_on(
|
|
||||||
Warnable::Select,
|
|
||||||
&cli.select,
|
|
||||||
&cli.ignore,
|
|
||||||
&cli.extend_ignore,
|
|
||||||
&configuration,
|
|
||||||
pyproject.as_ref(),
|
|
||||||
);
|
|
||||||
configuration.select = cli.select;
|
configuration.select = cli.select;
|
||||||
}
|
}
|
||||||
if !cli.extend_select.is_empty() {
|
if !cli.extend_select.is_empty() {
|
||||||
warn_on(
|
|
||||||
Warnable::ExtendSelect,
|
|
||||||
&cli.extend_select,
|
|
||||||
&cli.ignore,
|
|
||||||
&cli.extend_ignore,
|
|
||||||
&configuration,
|
|
||||||
pyproject.as_ref(),
|
|
||||||
);
|
|
||||||
configuration.extend_select = cli.extend_select;
|
configuration.extend_select = cli.extend_select;
|
||||||
}
|
}
|
||||||
if !cli.ignore.is_empty() {
|
if !cli.ignore.is_empty() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue