Skip to content

Commit 63eaa5b

Browse files
committed
refactor(lints): move lints definitions to a rules module
1 parent 8216db6 commit 63eaa5b

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

src/cargo/core/workspace.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ use crate::core::{
2121
};
2222
use crate::core::{EitherManifest, Package, SourceId, VirtualManifest};
2323
use crate::lints::analyze_cargo_lints_table;
24-
use crate::lints::blanket_hint_mostly_unused;
25-
use crate::lints::check_im_a_teapot;
26-
use crate::lints::implicit_minimum_version_req;
24+
use crate::lints::rules::blanket_hint_mostly_unused;
25+
use crate::lints::rules::check_im_a_teapot;
26+
use crate::lints::rules::implicit_minimum_version_req;
2727
use crate::ops;
2828
use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY, PathSource, SourceConfigMap};
2929
use crate::util::context::FeatureUnification;

src/cargo/lints/mod.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,10 @@ use std::fmt::Display;
1313
use std::ops::Range;
1414
use std::path::Path;
1515

16-
mod blanket_hint_mostly_unused;
17-
pub use blanket_hint_mostly_unused::blanket_hint_mostly_unused;
18-
mod implicit_minimum_version_req;
19-
pub use implicit_minimum_version_req::implicit_minimum_version_req;
20-
mod im_a_teapot;
21-
pub use im_a_teapot::check_im_a_teapot;
22-
mod unknown_lints;
23-
use unknown_lints::output_unknown_lints;
16+
pub mod rules;
17+
pub use rules::LINTS;
2418

2519
const LINT_GROUPS: &[LintGroup] = &[TEST_DUMMY_UNSTABLE];
26-
pub const LINTS: &[Lint] = &[
27-
blanket_hint_mostly_unused::LINT,
28-
implicit_minimum_version_req::LINT,
29-
im_a_teapot::LINT,
30-
unknown_lints::LINT,
31-
];
3220

3321
/// Scope at which a lint runs: package-level or workspace-level.
3422
pub enum ManifestFor<'a> {
@@ -129,7 +117,7 @@ pub fn analyze_cargo_lints_table(
129117
}
130118
}
131119

132-
output_unknown_lints(
120+
rules::output_unknown_lints(
133121
unknown_lints,
134122
&manifest,
135123
&manifest_path,
@@ -506,7 +494,7 @@ mod tests {
506494

507495
#[test]
508496
fn ensure_updated_lints() {
509-
let dir = snapbox::utils::current_dir!();
497+
let dir = snapbox::utils::current_dir!().join("rules");
510498
let mut expected = HashSet::new();
511499
for entry in std::fs::read_dir(&dir).unwrap() {
512500
let entry = entry.unwrap();
File renamed without changes.
File renamed without changes.

src/cargo/lints/rules/mod.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
mod blanket_hint_mostly_unused;
2+
mod im_a_teapot;
3+
mod implicit_minimum_version_req;
4+
mod unknown_lints;
5+
6+
pub use blanket_hint_mostly_unused::blanket_hint_mostly_unused;
7+
pub use im_a_teapot::check_im_a_teapot;
8+
pub use implicit_minimum_version_req::implicit_minimum_version_req;
9+
pub use unknown_lints::output_unknown_lints;
10+
11+
pub const LINTS: &[crate::lints::Lint] = &[
12+
blanket_hint_mostly_unused::LINT,
13+
implicit_minimum_version_req::LINT,
14+
im_a_teapot::LINT,
15+
unknown_lints::LINT,
16+
];

0 commit comments

Comments
 (0)