Skip to content
This repository was archived by the owner on Oct 14, 2025. It is now read-only.

Commit 3c18334

Browse files
committed
Revert "Show better error message on missing configuration entry"
This reverts commit 923c660.
1 parent 0ca873f commit 3c18334

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

crates/lib/src/core/linter/core.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ impl Linter {
163163
LintingResult { files }
164164
}
165165

166-
pub fn get_rulepack(&self) -> Result<RulePack, String> {
166+
pub fn get_rulepack(&self) -> RulePack {
167167
let rs = get_ruleset();
168168
rs.get_rulepack(&self.config)
169169
}
@@ -663,15 +663,7 @@ impl Linter {
663663
}
664664

665665
pub fn rules(&self) -> &[ErasedRule] {
666-
self.rules.get_or_init(|| {
667-
match self.get_rulepack() {
668-
Ok(rulepack) => rulepack.rules,
669-
Err(error) => {
670-
eprintln!("Error loading rules: {}", error);
671-
std::process::exit(1);
672-
}
673-
}
674-
})
666+
self.rules.get_or_init(|| self.get_rulepack().rules)
675667
}
676668

677669
pub fn formatter(&self) -> Option<&Arc<dyn Formatter>> {

crates/lib/src/core/rules/base.rs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -361,26 +361,21 @@ impl RuleSet {
361361
&self,
362362
glob_list: Vec<String>,
363363
reference_map: &AHashMap<&'static str, AHashSet<&'static str>>,
364-
) -> Result<AHashSet<&'static str>, String> {
364+
) -> AHashSet<&'static str> {
365365
let mut expanded_rule_set = AHashSet::new();
366366

367367
for r in glob_list {
368368
if reference_map.contains_key(r.as_str()) {
369369
expanded_rule_set.extend(reference_map[r.as_str()].clone());
370370
} else {
371-
let available_rules: Vec<&str> = reference_map.keys().copied().collect();
372-
return Err(format!(
373-
"Rule '{}' not found. Available rules: {}",
374-
r,
375-
available_rules.join(", ")
376-
));
371+
panic!("Rule {r} not found in rule reference map");
377372
}
378373
}
379374

380-
Ok(expanded_rule_set)
375+
expanded_rule_set
381376
}
382377

383-
pub(crate) fn get_rulepack(&self, config: &FluffConfig) -> Result<RulePack, String> {
378+
pub(crate) fn get_rulepack(&self, config: &FluffConfig) -> RulePack {
384379
let reference_map = self.rule_reference_map();
385380
let rules = config.get_section("rules");
386381
let keylist = self.register.keys();
@@ -402,8 +397,8 @@ impl RuleSet {
402397
None => Vec::new(),
403398
};
404399

405-
let expanded_allowlist = self.expand_rule_refs(allowlist, &reference_map)?;
406-
let expanded_denylist = self.expand_rule_refs(denylist, &reference_map)?;
400+
let expanded_allowlist = self.expand_rule_refs(allowlist, &reference_map);
401+
let expanded_denylist = self.expand_rule_refs(denylist, &reference_map);
407402

408403
let keylist: Vec<_> = keylist
409404
.into_iter()
@@ -425,9 +420,9 @@ impl RuleSet {
425420
instantiated_rules.push(rule.load_from_config(specific_rule_config).unwrap());
426421
}
427422

428-
Ok(RulePack {
423+
RulePack {
429424
rules: instantiated_rules,
430425
_reference_map: reference_map,
431-
})
426+
}
432427
}
433428
}

0 commit comments

Comments
 (0)