Resolve issues introduced by LinterSettings merge

astral-sh · Sep 26, 2023 · 78a1f3a · 78a1f3a
1 parent 235d5dc
commit 78a1f3a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 131 deletions.
diff --git a/crates/ruff/src/settings/defaults.rs b/crates/ruff/src/settings/defaults.rs
diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs
@@ -28,9 +28,9 @@ use crate::{codes, RuleSelector};
 
 use super::line_width::{LineLength, TabSize};
 
-use self::rule_selector::PreviewOptions;
 use self::rule_table::RuleTable;
 use self::types::PreviewMode;
+use crate::rule_selector::PreviewOptions;
 
 pub mod flags;
 pub mod rule_table;
@@ -123,7 +123,7 @@ impl LinterSettings {
             project_root: project_root.to_path_buf(),
             rules: PREFIXES
                 .iter()
-                .flat_map(|selector| selector.rules(PreviewOptions::default()))
+                .flat_map(|selector| selector.rules(&PreviewOptions::default()))
                 .collect(),
             allowed_confusables: FxHashSet::from_iter([]),
 

diff --git a/crates/ruff_workspace/src/configuration.rs b/crates/ruff_workspace/src/configuration.rs
@@ -214,6 +214,7 @@ impl Configuration {
                     .unwrap_or_else(|| TASK_TAGS.iter().map(ToString::to_string).collect()),
                 logger_objects: self.logger_objects.unwrap_or_default(),
                 preview,
+                explicit_preview_rules: self.explicit_preview_rules.unwrap_or_default(),
                 typing_modules: self.typing_modules.unwrap_or_default(),
                 // Plugins
                 flake8_annotations: self