Skip to content

Commit 9218d6b

Browse files
MichaReiserAlexWaygood
authored andcommitted
Remove allow-unused-imports setting from the common lint options (#13677)
Fixes #13668
1 parent 1b79ae9 commit 9218d6b

File tree

3 files changed

+2
-40
lines changed

3 files changed

+2
-40
lines changed

crates/ruff_workspace/src/configuration.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ pub struct LintConfiguration {
604604
pub logger_objects: Option<Vec<String>>,
605605
pub task_tags: Option<Vec<String>>,
606606
pub typing_modules: Option<Vec<String>>,
607-
pub allowed_unused_imports: Option<Vec<String>>,
608607

609608
// Plugins
610609
pub flake8_annotations: Option<Flake8AnnotationsOptions>,
@@ -717,7 +716,7 @@ impl LintConfiguration {
717716
task_tags: options.common.task_tags,
718717
logger_objects: options.common.logger_objects,
719718
typing_modules: options.common.typing_modules,
720-
allowed_unused_imports: options.common.allowed_unused_imports,
719+
721720
// Plugins
722721
flake8_annotations: options.common.flake8_annotations,
723722
flake8_bandit: options.common.flake8_bandit,
@@ -1086,9 +1085,7 @@ impl LintConfiguration {
10861085
.or(config.explicit_preview_rules),
10871086
task_tags: self.task_tags.or(config.task_tags),
10881087
typing_modules: self.typing_modules.or(config.typing_modules),
1089-
allowed_unused_imports: self
1090-
.allowed_unused_imports
1091-
.or(config.allowed_unused_imports),
1088+
10921089
// Plugins
10931090
flake8_annotations: self.flake8_annotations.combine(config.flake8_annotations),
10941091
flake8_bandit: self.flake8_bandit.combine(config.flake8_bandit),
@@ -1310,7 +1307,6 @@ fn warn_about_deprecated_top_level_lint_options(
13101307
explicit_preview_rules,
13111308
task_tags,
13121309
typing_modules,
1313-
allowed_unused_imports,
13141310
unfixable,
13151311
flake8_annotations,
13161312
flake8_bandit,
@@ -1409,9 +1405,6 @@ fn warn_about_deprecated_top_level_lint_options(
14091405
if typing_modules.is_some() {
14101406
used_options.push("typing-modules");
14111407
}
1412-
if allowed_unused_imports.is_some() {
1413-
used_options.push("allowed-unused-imports");
1414-
}
14151408

14161409
if unfixable.is_some() {
14171410
used_options.push("unfixable");

crates/ruff_workspace/src/options.rs

-10
Original file line numberDiff line numberDiff line change
@@ -785,16 +785,6 @@ pub struct LintCommonOptions {
785785
)]
786786
pub typing_modules: Option<Vec<String>>,
787787

788-
/// A list of modules which is allowed even though they are not used
789-
/// in the code.
790-
///
791-
/// This is useful when a module has a side effect when imported.
792-
#[option(
793-
default = r#"[]"#,
794-
value_type = "list[str]",
795-
example = r#"allowed-unused-imports = ["hvplot.pandas"]"#
796-
)]
797-
pub allowed_unused_imports: Option<Vec<String>>,
798788
/// A list of rule codes or prefixes to consider non-fixable.
799789
#[option(
800790
default = "[]",

ruff.schema.json

-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)