Skip to content

Commit 53a2df0

Browse files
committed
refactor: run clippy with --all-targets
1 parent 8844add commit 53a2df0

File tree

7 files changed

+28
-20
lines changed

7 files changed

+28
-20
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- uses: Boshen/setup-rust@main
103103
with:
104104
components: clippy
105-
- run: cargo clippy --all-features -- -D warnings
105+
- run: cargo clippy --all-features --all-targets -- -D warnings
106106

107107
doc:
108108
name: Doc

benches/resolver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn data() -> Vec<(PathBuf, &'static str)> {
1717
(cwd.clone(), "@napi-rs/wasm-runtime"),
1818
(cwd.clone(), "ava"),
1919
(cwd.clone(), "emnapi"),
20-
(cwd.clone(), "typescript"),
20+
(cwd, "typescript"),
2121
// relative path
2222
(f1.clone(), "./"),
2323
(f1.clone(), "./lib/index"),

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ test:
5252

5353
# Lint the whole project
5454
lint:
55-
cargo clippy --all-features -- --deny warnings
55+
cargo clippy --all-features --all-targets -- --deny warnings
5656

5757
# Generate doc
5858
doc:

src/tests/alias.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use normalize_path::NormalizePath;
66

77
use crate::{AliasValue, Resolution, ResolveContext, ResolveError, ResolveOptions, Resolver};
88

9+
#[allow(clippy::too_many_lines)]
910
#[test]
1011
#[cfg(not(target_os = "windows"))] // MemoryFS's path separator is always `/` so the test will not pass in windows.
1112
fn alias() {

src/tests/dependencies.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
mod windows {
55
use std::path::PathBuf;
66

7-
use rustc_hash::FxHashSet;
8-
97
use super::super::memory_fs::MemoryFS;
108
use crate::{ResolveContext, ResolveOptions, ResolverGeneric};
119

@@ -96,13 +94,11 @@ mod windows {
9694
for (name, context, request, result, file_dependencies, missing_dependencies) in data {
9795
let mut ctx = ResolveContext::default();
9896
let path = PathBuf::from(context);
99-
let resolved =
97+
let resolved_path =
10098
resolver.resolve_with_context(path, request, &mut ctx).map(|r| r.full_path());
101-
assert_eq!(resolved, Ok(PathBuf::from(result)));
102-
let file_dependencies =
103-
FxHashSet::from_iter(file_dependencies.iter().map(PathBuf::from));
104-
let missing_dependencies =
105-
FxHashSet::from_iter(missing_dependencies.iter().map(PathBuf::from));
99+
assert_eq!(resolved_path, Ok(PathBuf::from(result)));
100+
let file_dependencies = file_dependencies.iter().map(PathBuf::from).collect();
101+
let missing_dependencies = missing_dependencies.iter().map(PathBuf::from).collect();
106102
assert_eq!(ctx.file_dependencies, file_dependencies, "{name}");
107103
assert_eq!(ctx.missing_dependencies, missing_dependencies, "{name}");
108104
}

src/tests/exports_field.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,7 +2522,7 @@ fn test_cases() {
25222522
..ResolveOptions::default()
25232523
});
25242524
let cached_path = resolver.cache.value(Path::new(""));
2525-
let resolved = resolver
2525+
let resolved_path = resolver
25262526
.package_exports_resolve(
25272527
&cached_path,
25282528
case.request,
@@ -2533,18 +2533,23 @@ fn test_cases() {
25332533
if let Some(expect) = case.expect {
25342534
if expect.is_empty() {
25352535
assert!(
2536-
matches!(resolved, Err(ResolveError::PackagePathNotExported(_, _))),
2536+
matches!(resolved_path, Err(ResolveError::PackagePathNotExported(_, _))),
25372537
"{} {:?}",
25382538
&case.name,
2539-
&resolved
2539+
&resolved_path
25402540
);
25412541
} else {
25422542
for expect in expect {
2543-
assert_eq!(resolved, Ok(Some(Path::new(expect).normalize())), "{}", &case.name);
2543+
assert_eq!(
2544+
resolved_path,
2545+
Ok(Some(Path::new(expect).normalize())),
2546+
"{}",
2547+
&case.name
2548+
);
25442549
}
25452550
}
25462551
} else {
2547-
assert!(resolved.is_err(), "{} {resolved:?}", &case.name);
2552+
assert!(resolved_path.is_err(), "{} {resolved_path:?}", &case.name);
25482553
}
25492554
}
25502555
}

src/tests/imports_field.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ fn imports_field(value: serde_json::Value) -> JSONMap {
106106
serde_json::from_str(&s).unwrap()
107107
}
108108

109+
#[allow(clippy::too_many_lines)]
109110
#[test]
110111
fn test_cases() {
111112
let test_cases = [
@@ -1298,7 +1299,7 @@ fn test_cases() {
12981299
for case in test_cases {
12991300
let resolver = Resolver::default();
13001301
let cached_path = resolver.cache.value(Path::new(""));
1301-
let resolved = resolver
1302+
let resolved_path = resolver
13021303
.package_imports_exports_resolve(
13031304
case.request,
13041305
&case.imports_field,
@@ -1310,14 +1311,19 @@ fn test_cases() {
13101311
.map(|p| p.map(|p| p.to_path_buf()));
13111312
if let Some(expect) = case.expect {
13121313
if expect.is_empty() {
1313-
assert!(matches!(resolved, Ok(None)), "{} {:?}", &case.name, &resolved);
1314+
assert!(matches!(resolved_path, Ok(None)), "{} {:?}", &case.name, &resolved_path);
13141315
} else {
13151316
for expect in expect {
1316-
assert_eq!(resolved, Ok(Some(Path::new(expect).normalize())), "{}", &case.name);
1317+
assert_eq!(
1318+
resolved_path,
1319+
Ok(Some(Path::new(expect).normalize())),
1320+
"{}",
1321+
&case.name
1322+
);
13171323
}
13181324
}
13191325
} else {
1320-
assert!(resolved.is_err(), "{} {resolved:?}", &case.name);
1326+
assert!(resolved_path.is_err(), "{} {resolved_path:?}", &case.name);
13211327
}
13221328
}
13231329
}

0 commit comments

Comments
 (0)