scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-14 23:22:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(test): resolve clippy and fmt findings in upgrade test helper

Browse source 
Clippy flagged hard_link_or_copy's match as single_match_else;
rewrite as an early-return if. rustfmt reformatted the long
chained path join in brew_command and the multi-arg
hard_link_or_copy call.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-04-17 19:39:51 -04:00
parent d52e6829c2
commit db953c838b
No known key found for this signature in database
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/crates/fabro-cli/tests/it/cmd/upgrade.rs
View file

@ -2,30 +2,37 @@ use assert_cmd::Command;
use fabro_test::{TestContext, fabro_snapshot, test_context}; use fabro_test::{TestContext, fabro_snapshot, test_context};
fn hard_link_or_copy(src: &std::path::Path, dest: &std::path::Path) { fn hard_link_or_copy(src: &std::path::Path, dest: &std::path::Path) {
match std::fs::hard_link(src, dest) { if std::fs::hard_link(src, dest).is_ok() {
Ok(()) => {} return;
Err(_) => { }
std::fs::copy(src, dest).expect("copy test binary into fake Cellar");
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
let perms = std::fs::metadata(src) std::fs::copy(src, dest).expect("copy test binary into fake Cellar");
.expect("read source binary metadata") #[cfg(unix)]
.permissions() {
.mode(); use std::os::unix::fs::PermissionsExt;
std::fs::set_permissions(dest, std::fs::Permissions::from_mode(perms))
.expect("preserve executable permissions"); let perms = std::fs::metadata(src)
} .expect("read source binary metadata")
} .permissions()
.mode();
std::fs::set_permissions(dest, std::fs::Permissions::from_mode(perms))
.expect("preserve executable permissions");
} }
} }
fn brew_command(context: &TestContext, formula: &str, version: &str) -> Command { fn brew_command(context: &TestContext, formula: &str, version: &str) -> Command {
let bin_dir = context.temp_dir.join("Cellar").join(formula).join(version).join("bin"); let bin_dir = context
.temp_dir
.join("Cellar")
.join(formula)
.join(version)
.join("bin");
std::fs::create_dir_all(&bin_dir).expect("create fake Cellar bin dir"); std::fs::create_dir_all(&bin_dir).expect("create fake Cellar bin dir");
let brew_fabro = bin_dir.join("fabro"); let brew_fabro = bin_dir.join("fabro");
hard_link_or_copy(std::path::Path::new(env!("CARGO_BIN_EXE_fabro")), &brew_fabro); hard_link_or_copy(
std::path::Path::new(env!("CARGO_BIN_EXE_fabro")),
&brew_fabro,
);
let mut cmd = Command::new(&brew_fabro); let mut cmd = Command::new(&brew_fabro);
cmd.current_dir(&context.temp_dir); cmd.current_dir(&context.temp_dir);