Skip to content

Commit e13dc4d

Browse files
Brooooooklynclaude
Brooooooklyn
and
claude
committed
style: fix clippy::semicolon_if_nothing_returned
Add missing semicolons to statements for consistent formatting across: - Test assertions in vite_path - Test closures in vite_task - Various test functions in vite_package_manager and other modules 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent a0a1abf commit e13dc4d

14 files changed

Lines changed: 150 additions & 149 deletions

File tree

‎crates/fspy_shared_unix/src/exec/which.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,20 @@ mod tests {
115115
let file: &BStr = B("foo").as_bstr();
116116
let path: &BStr = B("/bin:/usr/bin").as_bstr();
117117
let access = mock_access(&["/bin/foo"], &[], &[]);
118-
let res = which(&file, &path, access, |found| {
118+
let res = which(file, path, access, |found| {
119119
*called.borrow_mut() = Some(found.to_owned());
120120
Ok(())
121121
});
122122
assert!(res.is_ok());
123-
assert_eq!(&*called.borrow().as_ref().unwrap(), b"/bin/foo".as_bstr());
123+
assert_eq!(called.borrow().as_ref().unwrap(), b"/bin/foo".as_bstr());
124124
}
125125

126126
#[test]
127127
fn test_which_not_found() {
128128
let file: &BStr = B("foo").as_bstr();
129129
let path: &BStr = B("/bin:/usr/bin").as_bstr();
130130
let access = mock_access(&[], &[], &[]);
131-
let res = which(&file, &path, access, |_| Ok(()));
131+
let res = which(file, path, access, |_| Ok(()));
132132
assert_eq!(res.unwrap_err(), nix::Error::ENOENT);
133133
}
134134

@@ -137,7 +137,7 @@ mod tests {
137137
let file: &BStr = B("foo").as_bstr();
138138
let path: &BStr = B("/bin:/usr/bin").as_bstr();
139139
let access = mock_access(&[], &["/bin/foo", "/usr/bin/foo"], &[]);
140-
let res = which(&file, &path, access, |_| Ok(()));
140+
let res = which(file, path, access, |_| Ok(()));
141141
assert_eq!(res.unwrap_err(), nix::Error::EACCES);
142142
}
143143

@@ -146,7 +146,7 @@ mod tests {
146146
let file: &BStr = B("foo").as_bstr();
147147
let path: &BStr = B("/usr/bin:/bin").as_bstr();
148148
let access = mock_access(&[], &[], &["/bin/foo"]);
149-
let res = which(&file, &path, access, |_| Ok(()));
149+
let res = which(file, path, access, |_| Ok(()));
150150
assert_eq!(res.unwrap_err(), nix::Error::ENOTDIR);
151151
}
152152

@@ -156,20 +156,20 @@ mod tests {
156156
let file: &BStr = B("/usr/bin/foo").as_bstr();
157157
let path: &BStr = B("").as_bstr();
158158
let access = mock_access(&["/usr/bin/foo"], &[], &[]);
159-
let res = which(&file, &path, access, |found| {
159+
let res = which(file, path, access, |found| {
160160
*called.borrow_mut() = Some(found.to_owned());
161161
Ok(())
162162
});
163163
assert!(res.is_ok());
164-
assert_eq!(&*called.borrow().as_ref().unwrap(), b"/usr/bin/foo".as_bstr());
164+
assert_eq!(called.borrow().as_ref().unwrap(), b"/usr/bin/foo".as_bstr());
165165
}
166166

167167
#[test]
168168
fn test_which_empty_file() {
169169
let file: &BStr = B("").as_bstr();
170170
let path: &BStr = B("/bin:/usr/bin").as_bstr();
171171
let access = mock_access(&[], &[], &[]);
172-
let res = which(&file, &path, access, |_| Ok(()));
172+
let res = which(file, path, access, |_| Ok(()));
173173
assert_eq!(res.unwrap_err(), nix::Error::ENOENT);
174174
}
175175

@@ -179,7 +179,7 @@ mod tests {
179179
let file: &BStr = B(&long_name).as_bstr();
180180
let path: &BStr = B("/bin:/usr/bin").as_bstr();
181181
let access = mock_access(&[], &[], &[]);
182-
let res = which(&file, &path, access, |_| Ok(()));
182+
let res = which(file, path, access, |_| Ok(()));
183183
assert_eq!(res.unwrap_err(), nix::Error::ENAMETOOLONG);
184184
}
185185

@@ -189,11 +189,11 @@ mod tests {
189189
let file: &BStr = B("foo").as_bstr();
190190
let path: &BStr = B(":/bin").as_bstr();
191191
let access = mock_access(&["foo"], &[], &[]);
192-
let res = which(&file, &path, access, |found| {
192+
let res = which(file, path, access, |found| {
193193
*called.borrow_mut() = Some(found.to_owned());
194194
Ok(())
195195
});
196196
assert!(res.is_ok());
197-
assert_eq!(&*called.borrow().as_ref().unwrap(), b"foo".as_bstr());
197+
assert_eq!(called.borrow().as_ref().unwrap(), b"foo".as_bstr());
198198
}
199199
}

‎crates/vite_package_manager/src/package_manager.rs‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ mod tests {
934934
let package_json_path = temp_dir.path().join("package.json");
935935
let package_json: serde_json::Value =
936936
serde_json::from_slice(&fs::read(&package_json_path).unwrap()).unwrap();
937-
println!("package_json: {:?}", package_json);
937+
println!("package_json: {package_json:?}");
938938
assert!(package_json["packageManager"].as_str().unwrap().starts_with("pnpm@"));
939939
// keep other fields
940940
assert_eq!(package_json["version"].as_str().unwrap(), "1.0.0");
@@ -967,7 +967,7 @@ mod tests {
967967
let package_json_path = temp_dir_path.join("package.json");
968968
let package_json: serde_json::Value =
969969
serde_json::from_slice(&fs::read(&package_json_path).unwrap()).unwrap();
970-
println!("package_json: {:?}", package_json);
970+
println!("package_json: {package_json:?}");
971971
assert!(package_json["packageManager"].as_str().unwrap().starts_with("yarn@"));
972972
// keep other fields
973973
assert_eq!(package_json["name"].as_str().unwrap(), "test-package");
@@ -993,12 +993,12 @@ mod tests {
993993

994994
// check shim files
995995
let bin_prefix = result.get_bin_prefix();
996-
assert!(is_exists_file(&bin_prefix.join("npm")).unwrap());
997-
assert!(is_exists_file(&bin_prefix.join("npm.cmd")).unwrap());
998-
assert!(is_exists_file(&bin_prefix.join("npm.ps1")).unwrap());
999-
assert!(is_exists_file(&bin_prefix.join("npx")).unwrap());
1000-
assert!(is_exists_file(&bin_prefix.join("npx.cmd")).unwrap());
1001-
assert!(is_exists_file(&bin_prefix.join("npx.ps1")).unwrap());
996+
assert!(is_exists_file(bin_prefix.join("npm")).unwrap());
997+
assert!(is_exists_file(bin_prefix.join("npm.cmd")).unwrap());
998+
assert!(is_exists_file(bin_prefix.join("npm.ps1")).unwrap());
999+
assert!(is_exists_file(bin_prefix.join("npx")).unwrap());
1000+
assert!(is_exists_file(bin_prefix.join("npx.cmd")).unwrap());
1001+
assert!(is_exists_file(bin_prefix.join("npx.ps1")).unwrap());
10021002

10031003
// run npm --version
10041004
let mut paths =
@@ -1039,12 +1039,12 @@ mod tests {
10391039

10401040
// check shim files
10411041
let bin_prefix = result.get_bin_prefix();
1042-
assert!(is_exists_file(&bin_prefix.join("pnpm.cjs")).unwrap());
1043-
assert!(is_exists_file(&bin_prefix.join("pnpm.cmd")).unwrap());
1044-
assert!(is_exists_file(&bin_prefix.join("pnpm.ps1")).unwrap());
1045-
assert!(is_exists_file(&bin_prefix.join("pnpx.cjs")).unwrap());
1046-
assert!(is_exists_file(&bin_prefix.join("pnpx.cmd")).unwrap());
1047-
assert!(is_exists_file(&bin_prefix.join("pnpx.ps1")).unwrap());
1042+
assert!(is_exists_file(bin_prefix.join("pnpm.cjs")).unwrap());
1043+
assert!(is_exists_file(bin_prefix.join("pnpm.cmd")).unwrap());
1044+
assert!(is_exists_file(bin_prefix.join("pnpm.ps1")).unwrap());
1045+
assert!(is_exists_file(bin_prefix.join("pnpx.cjs")).unwrap());
1046+
assert!(is_exists_file(bin_prefix.join("pnpx.cmd")).unwrap());
1047+
assert!(is_exists_file(bin_prefix.join("pnpx.ps1")).unwrap());
10481048

10491049
// run pnpm --version
10501050
let mut paths =
@@ -1180,13 +1180,13 @@ mod tests {
11801180

11811181
// check shim files
11821182
let bin_prefix = result.get_bin_prefix();
1183-
assert!(is_exists_file(&bin_prefix.join("yarn.js")).unwrap());
1184-
assert!(is_exists_file(&bin_prefix.join("yarn")).unwrap());
1185-
assert!(is_exists_file(&bin_prefix.join("yarn.cmd")).unwrap());
1186-
assert!(is_exists_file(&bin_prefix.join("yarn.ps1")).unwrap());
1187-
assert!(is_exists_file(&bin_prefix.join("yarnpkg")).unwrap());
1188-
assert!(is_exists_file(&bin_prefix.join("yarnpkg.cmd")).unwrap());
1189-
assert!(is_exists_file(&bin_prefix.join("yarnpkg.ps1")).unwrap());
1183+
assert!(is_exists_file(bin_prefix.join("yarn.js")).unwrap());
1184+
assert!(is_exists_file(bin_prefix.join("yarn")).unwrap());
1185+
assert!(is_exists_file(bin_prefix.join("yarn.cmd")).unwrap());
1186+
assert!(is_exists_file(bin_prefix.join("yarn.ps1")).unwrap());
1187+
assert!(is_exists_file(bin_prefix.join("yarnpkg")).unwrap());
1188+
assert!(is_exists_file(bin_prefix.join("yarnpkg.cmd")).unwrap());
1189+
assert!(is_exists_file(bin_prefix.join("yarnpkg.ps1")).unwrap());
11901190

11911191
// run pnpm --version
11921192
let mut paths =
@@ -1280,13 +1280,13 @@ mod tests {
12801280

12811281
// check shim files
12821282
let bin_prefix = result.get_bin_prefix();
1283-
assert!(is_exists_file(&bin_prefix.join("yarn.js")).unwrap());
1284-
assert!(is_exists_file(&bin_prefix.join("yarn")).unwrap());
1285-
assert!(is_exists_file(&bin_prefix.join("yarn.cmd")).unwrap());
1286-
assert!(is_exists_file(&bin_prefix.join("yarn.ps1")).unwrap());
1287-
assert!(is_exists_file(&bin_prefix.join("yarnpkg")).unwrap());
1288-
assert!(is_exists_file(&bin_prefix.join("yarnpkg.cmd")).unwrap());
1289-
assert!(is_exists_file(&bin_prefix.join("yarnpkg.ps1")).unwrap());
1283+
assert!(is_exists_file(bin_prefix.join("yarn.js")).unwrap());
1284+
assert!(is_exists_file(bin_prefix.join("yarn")).unwrap());
1285+
assert!(is_exists_file(bin_prefix.join("yarn.cmd")).unwrap());
1286+
assert!(is_exists_file(bin_prefix.join("yarn.ps1")).unwrap());
1287+
assert!(is_exists_file(bin_prefix.join("yarnpkg")).unwrap());
1288+
assert!(is_exists_file(bin_prefix.join("yarnpkg.cmd")).unwrap());
1289+
assert!(is_exists_file(bin_prefix.join("yarnpkg.ps1")).unwrap());
12901290

12911291
// run yarn --version
12921292
let mut cmd = "yarn";
@@ -1346,13 +1346,13 @@ mod tests {
13461346

13471347
let result = PackageManager::builder(temp_dir_path).build().await;
13481348
assert!(result.is_err());
1349-
println!("result: {:?}", result);
1349+
println!("result: {result:?}");
13501350
// Check if it's the expected error type
13511351
if let Err(Error::PackageManagerVersionNotFound { name, version, .. }) = result {
13521352
assert_eq!(name, "yarn");
13531353
assert_eq!(version, "10000000000.0.0");
13541354
} else {
1355-
panic!("Expected PackageManagerVersionNotFound error, got {:?}", result);
1355+
panic!("Expected PackageManagerVersionNotFound error, got {result:?}");
13561356
}
13571357
}
13581358

@@ -1365,7 +1365,7 @@ mod tests {
13651365
create_package_json(&temp_dir_path, package_content);
13661366

13671367
let result = PackageManager::builder(temp_dir_path).build().await;
1368-
println!("result: {:?}", result);
1368+
println!("result: {result:?}");
13691369
assert!(result.is_err());
13701370
}
13711371

@@ -1402,7 +1402,7 @@ mod tests {
14021402
let result = PackageManager::builder(temp_dir_path).build().await;
14031403
assert!(result.is_err());
14041404
// Check if it's the expected error type
1405-
if let Err(Error::UnrecognizedPackageManager) = result {
1405+
if matches!(result, Err(Error::UnrecognizedPackageManager)) {
14061406
// Expected error
14071407
} else {
14081408
panic!("Expected UnrecognizedPackageManager error");
@@ -1474,18 +1474,18 @@ mod tests {
14741474
.await;
14751475
assert!(result.is_ok());
14761476
let target_dir = result.unwrap();
1477-
println!("result: {:?}", target_dir);
1478-
assert!(is_exists_file(&target_dir.join("bin/yarn")).unwrap());
1479-
assert!(is_exists_file(&target_dir.join("bin/yarn.cmd")).unwrap());
1477+
println!("result: {target_dir:?}");
1478+
assert!(is_exists_file(target_dir.join("bin/yarn")).unwrap());
1479+
assert!(is_exists_file(target_dir.join("bin/yarn.cmd")).unwrap());
14801480

14811481
// again should skip download
14821482
let result =
14831483
download_package_manager(PackageManagerType::Yarn, "@yarnpkg/cli-dist", "4.9.2", None)
14841484
.await;
14851485
assert!(result.is_ok());
14861486
let target_dir = result.unwrap();
1487-
assert!(is_exists_file(&target_dir.join("bin/yarn")).unwrap());
1488-
assert!(is_exists_file(&target_dir.join("bin/yarn.cmd")).unwrap());
1487+
assert!(is_exists_file(target_dir.join("bin/yarn")).unwrap());
1488+
assert!(is_exists_file(target_dir.join("bin/yarn.cmd")).unwrap());
14891489

14901490
remove_dir_all_force(target_dir).await.unwrap();
14911491
}
@@ -1683,7 +1683,7 @@ mod tests {
16831683
version: "1.0.0".into(),
16841684
hash: None,
16851685
bin_name: pm_type.to_string().into(),
1686-
workspace_root: temp_dir_path.clone(),
1686+
workspace_root: temp_dir_path,
16871687
install_dir,
16881688
}
16891689
}

‎crates/vite_package_manager/src/request.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ mod tests {
468468
let url = format!("{}/file.txt", server.base_url());
469469

470470
let result = client.download_file(&url, &target_file).await;
471-
assert!(result.is_ok(), "Failed to download file: {:?}", result);
471+
assert!(result.is_ok(), "Failed to download file: {result:?}");
472472

473473
// Verify file exists and has correct content
474474
assert!(target_file.exists());
@@ -513,7 +513,7 @@ mod tests {
513513

514514
let url = format!("{}/test-package.tgz", server.base_url());
515515
let result = download_and_extract_tgz_with_hash(&url, &target_dir, None).await;
516-
assert!(result.is_ok(), "Failed to download and extract: {:?}", result);
516+
assert!(result.is_ok(), "Failed to download and extract: {result:?}");
517517

518518
assert!(target_dir.join("package/bin/yarn").exists());
519519
assert!(target_dir.join("package/bin/yarn.cmd").exists());

‎crates/vite_package_manager/src/shim.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ mod tests {
116116
use super::*;
117117

118118
fn format_shim(shim: &str) -> String {
119-
shim.replace(" ", "·")
119+
shim.replace(' ', "·")
120120
}
121121

122122
#[test]
@@ -402,7 +402,7 @@ mod tests {
402402
assert!(ps1.contains(path));
403403

404404
let cmd = cmd_shim(path);
405-
let expected_cmd_path = path.replace("/", "\\");
405+
let expected_cmd_path = path.replace('/', "\\");
406406
assert!(cmd.contains(&expected_cmd_path));
407407
}
408408
}

‎crates/vite_path/src/absolute.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ mod tests {
206206

207207
#[test]
208208
fn non_absolute() {
209-
assert!(AbsolutePath::new(Path::new("foo/bar")).is_none())
209+
assert!(AbsolutePath::new(Path::new("foo/bar")).is_none());
210210
}
211211

212212
#[test]

‎crates/vite_path/src/relative.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,54 +326,54 @@ mod tests {
326326
#[test]
327327
fn normalize_dots() {
328328
let rel_path = RelativePathBuf::new("./foo/./bar/.").unwrap();
329-
assert_eq!(rel_path.as_str(), "foo/bar")
329+
assert_eq!(rel_path.as_str(), "foo/bar");
330330
}
331331

332332
#[test]
333333
fn normalize_trailing_slashes() {
334334
let rel_path = RelativePathBuf::new("foo/bar//").unwrap();
335-
assert_eq!(rel_path.as_str(), "foo/bar")
335+
assert_eq!(rel_path.as_str(), "foo/bar");
336336
}
337337
#[test]
338338
fn preserve_double_dots() {
339339
let rel_path = RelativePathBuf::new("../foo/../bar/..").unwrap();
340-
assert_eq!(rel_path.as_str(), "../foo/../bar/..")
340+
assert_eq!(rel_path.as_str(), "../foo/../bar/..");
341341
}
342342

343343
#[test]
344344
fn push() {
345345
let mut rel_path = RelativePathBuf::new("foo/bar").unwrap();
346346
rel_path.push(RelativePathBuf::new(Path::new("baz")).unwrap());
347-
assert_eq!(rel_path.as_str(), "foo/bar/baz")
347+
assert_eq!(rel_path.as_str(), "foo/bar/baz");
348348
}
349349

350350
#[test]
351351
fn push_empty() {
352352
let mut rel_path = RelativePathBuf::new("foo/bar").unwrap();
353353
rel_path.push(RelativePathBuf::new("").unwrap());
354-
assert_eq!(rel_path.as_str(), "foo/bar")
354+
assert_eq!(rel_path.as_str(), "foo/bar");
355355
}
356356

357357
#[test]
358358
fn join() {
359359
let rel_path = RelativePathBuf::new("foo/bar").unwrap();
360360
let joined_path = rel_path.as_relative_path().join(RelativePathBuf::new("baz").unwrap());
361-
assert_eq!(joined_path.as_str(), "foo/bar/baz")
361+
assert_eq!(joined_path.as_str(), "foo/bar/baz");
362362
}
363363

364364
#[test]
365365
fn join_empty() {
366366
let rel_path = RelativePathBuf::new("").unwrap();
367367
let joined_path = rel_path.as_relative_path().join(RelativePathBuf::new("baz").unwrap());
368-
assert_eq!(joined_path.as_str(), "baz")
368+
assert_eq!(joined_path.as_str(), "baz");
369369
}
370370

371371
#[test]
372372
fn strip_prefix() {
373373
let rel_path = RelativePathBuf::new("foo/bar/baz").unwrap();
374374
let prefix = RelativePathBuf::new("foo").unwrap();
375375
let stripped_path = rel_path.strip_prefix(prefix).unwrap();
376-
assert_eq!(stripped_path.as_str(), "bar/baz")
376+
assert_eq!(stripped_path.as_str(), "bar/baz");
377377
}
378378

379379
#[test]

0 commit comments

Comments
 (0)