Lints and suggestions for the Nix programming language
minor refactor
+10
-11
+4
-4
bin/src/main.rs
+4
-4
bin/src/main.rs
···
21
21
let vfs = lint_config.vfs()?;
22
22
let (reports, errors): (Vec<_>, Vec<_>) =
23
23
vfs.iter().map(lint::lint).partition(Result::is_ok);
24
-
let lint_results: Vec<_> = reports.into_iter().map(Result::unwrap).collect();
25
-
let errors: Vec<_> = errors.into_iter().map(Result::unwrap_err).collect();
24
+
let lint_results = reports.into_iter().map(Result::unwrap);
25
+
let errors = errors.into_iter().map(Result::unwrap_err);
26
26
27
27
let mut stderr = io::stderr();
28
-
lint_results.into_iter().for_each(|r| {
28
+
lint_results.for_each(|r| {
29
29
stderr.write(&r, &vfs).unwrap();
30
30
});
31
-
errors.into_iter().for_each(|e| {
31
+
errors.for_each(|e| {
32
32
eprintln!("{}", e);
33
33
});
34
34
}
+3
-4
lib/src/lints/legacy_let_syntax.rs
+3
-4
lib/src/lints/legacy_let_syntax.rs
···
23
23
24
24
if legacy_let
25
25
.entries()
26
-
.find(|kv| matches!(kv.key(), Some(k) if key_is_ident(&k, "body")))
27
-
.is_some();
26
+
.any(|kv| matches!(kv.key(), Some(k) if key_is_ident(&k, "body")));
28
27
29
28
then {
30
29
let inherits = legacy_let.inherits();
31
30
let entries = legacy_let.entries();
32
31
let attrset = make::attrset(inherits, entries, true);
33
-
let parenthesized = make::parenthesize(&attrset.node());
34
-
let selected = make::select(parenthesized.node(), &make::ident("body").node());
32
+
let parenthesized = make::parenthesize(attrset.node());
33
+
let selected = make::select(parenthesized.node(), make::ident("body").node());
35
34
36
35
let at = node.text_range();
37
36
let message = "Prefer `rec` over undocumented `let` syntax";
+1
-1
lib/src/lints/manual_inherit.rs
+1
-1
lib/src/lints/manual_inherit.rs
···
32
32
then {
33
33
let at = node.text_range();
34
34
let replacement = make::inherit_stmt(&[key]).node().clone();
35
-
let message = format!("This assignment is better written with `inherit`");
35
+
let message = "This assignment is better written with `inherit`";
36
36
Some(Self::report().suggest(at, message, Suggestion::new(at, replacement)))
37
37
} else {
38
38
None
+1
-1
lib/src/lints/manual_inherit_from.rs
+1
-1
lib/src/lints/manual_inherit_from.rs
···
37
37
let set = value.set()?;
38
38
make::inherit_from_stmt(set, &[key]).node().clone()
39
39
};
40
-
let message = format!("This assignment is better written with `inherit`");
40
+
let message = "This assignment is better written with `inherit`";
41
41
Some(Self::report().suggest(at, message, Suggestion::new(at, replacement)))
42
42
} else {
43
43
None
+1
-1
vfs/src/lib.rs
+1
-1
vfs/src/lib.rs
···
58
58
let file_id = self.alloc_file_id(path);
59
59
self.data.insert(file_id, contents.to_owned());
60
60
}
61
-
pub fn iter<'ρ>(&'ρ self) -> impl Iterator<Item = VfsEntry<'ρ>> {
61
+
pub fn iter(&self) -> impl Iterator<Item = VfsEntry> {
62
62
self.data.iter().map(move |(file_id, _)| VfsEntry {
63
63
file_id: *file_id,
64
64
file_path: self.file_path(*file_id),