Skip to content

Commit 04f4686

Browse files
committed
Fix formatting (cargo fmt)
1 parent 716ee4a commit 04f4686

8 files changed

Lines changed: 107 additions & 167 deletions

File tree

crates/affected-cli/src/main.rs

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,7 @@ fn main() -> Result<()> {
372372
merge_base,
373373
} => {
374374
let base_ref = match (&base, &merge_base) {
375-
(Some(_), _) | (_, Some(_)) => {
376-
Some(resolve_base(&root, base, merge_base)?)
377-
}
375+
(Some(_), _) | (_, Some(_)) => Some(resolve_base(&root, base, merge_base)?),
378376
_ => None,
379377
};
380378
cmd_graph(&root, dot, base_ref.as_deref())
@@ -388,19 +386,19 @@ fn main() -> Result<()> {
388386
format,
389387
} => {
390388
let base_ref = resolve_base(&root, base, merge_base)?;
391-
cmd_ci(
392-
&root,
393-
&base_ref,
394-
filter.as_deref(),
395-
skip.as_deref(),
396-
format,
397-
)
389+
cmd_ci(&root, &base_ref, filter.as_deref(), skip.as_deref(), format)
398390
}
399391
Commands::Init { non_interactive } => cmd_init(&root, non_interactive),
400392
Commands::Watch {
401393
subcommand,
402394
debounce,
403-
} => cmd_watch(&root, subcommand, debounce, cli.config.as_deref(), cli.quiet),
395+
} => cmd_watch(
396+
&root,
397+
subcommand,
398+
debounce,
399+
cli.config.as_deref(),
400+
cli.quiet,
401+
),
404402
Commands::Run {
405403
command,
406404
base,
@@ -738,8 +736,7 @@ fn cmd_graph(root: &std::path::Path, dot: bool, base: Option<&str>) -> Result<()
738736

739737
// Get affected packages if base is specified
740738
let affected_set: std::collections::HashSet<String> = if let Some(base_ref) = base {
741-
let result =
742-
affected_core::find_affected_with_options(root, base_ref, false, None, None)?;
739+
let result = affected_core::find_affected_with_options(root, base_ref, false, None, None)?;
743740
result.affected.into_iter().collect()
744741
} else {
745742
std::collections::HashSet::new()
@@ -799,7 +796,14 @@ fn cmd_graph(root: &std::path::Path, dot: bool, base: Option<&str>) -> Result<()
799796

800797
for (i, root_pkg) in roots.iter().enumerate() {
801798
let is_last_root = i == roots.len() - 1;
802-
render_tree_node(root_pkg, "", is_last_root, &children, &affected_set, &mut std::collections::HashSet::new());
799+
render_tree_node(
800+
root_pkg,
801+
"",
802+
is_last_root,
803+
&children,
804+
&affected_set,
805+
&mut std::collections::HashSet::new(),
806+
);
803807
}
804808

805809
// Show isolated packages (no edges at all)
@@ -817,7 +821,12 @@ fn cmd_graph(root: &std::path::Path, dot: bool, base: Option<&str>) -> Result<()
817821
} else {
818822
String::new()
819823
};
820-
println!(" {}{} {}", name.cyan(), marker, "(no dependencies)".dimmed());
824+
println!(
825+
" {}{} {}",
826+
name.cyan(),
827+
marker,
828+
"(no dependencies)".dimmed()
829+
);
821830
}
822831
}
823832

@@ -864,7 +873,14 @@ fn render_tree_node(
864873
if let Some(deps) = children.get(name) {
865874
for (j, dep) in deps.iter().enumerate() {
866875
let is_last_child = j == deps.len() - 1;
867-
render_tree_node(dep, &child_prefix, is_last_child, children, affected, visited);
876+
render_tree_node(
877+
dep,
878+
&child_prefix,
879+
is_last_child,
880+
children,
881+
affected,
882+
visited,
883+
);
868884
}
869885
}
870886
}
@@ -1023,11 +1039,7 @@ fn cmd_init(root: &std::path::Path, non_interactive: bool) -> Result<()> {
10231039

10241040
if !non_interactive {
10251041
if let Some(ref eco) = ecosystem_name {
1026-
println!(
1027-
" {} Detected ecosystem: {}",
1028-
"✓".green(),
1029-
eco.cyan()
1030-
);
1042+
println!(" {} Detected ecosystem: {}", "✓".green(), eco.cyan());
10311043
} else {
10321044
println!(
10331045
" {} No ecosystem auto-detected. Config will use defaults.",
@@ -1074,9 +1086,8 @@ fn cmd_init(root: &std::path::Path, non_interactive: bool) -> Result<()> {
10741086
.collect::<Vec<_>>()
10751087
.join(", ");
10761088

1077-
let mut config_content = String::from(
1078-
"# .affected.toml — configuration for the `affected` CLI\n\n",
1079-
);
1089+
let mut config_content =
1090+
String::from("# .affected.toml — configuration for the `affected` CLI\n\n");
10801091

10811092
config_content.push_str(&format!("ignore = [{}]\n\n", ignore_str));
10821093
config_content.push_str("[test]\n");
@@ -1122,10 +1133,9 @@ fn cmd_watch(
11221133
let mut debouncer = new_debouncer(debounce_dur, tx)?;
11231134

11241135
// Watch the project root recursively
1125-
debouncer.watcher().watch(
1126-
root,
1127-
notify::RecursiveMode::Recursive,
1128-
)?;
1136+
debouncer
1137+
.watcher()
1138+
.watch(root, notify::RecursiveMode::Recursive)?;
11291139

11301140
// Directories to ignore
11311141
let ignore_dirs: Vec<&str> = vec![".git", "target", "node_modules", "_build", ".dart_tool"];
@@ -1147,19 +1157,15 @@ fn cmd_watch(
11471157
return false;
11481158
}
11491159
let path_str = event.path.to_string_lossy();
1150-
!ignore_dirs.iter().any(|d| path_str.contains(&format!("/{}/", d)))
1160+
!ignore_dirs
1161+
.iter()
1162+
.any(|d| path_str.contains(&format!("/{}/", d)))
11511163
});
11521164

11531165
if relevant {
1154-
println!(
1155-
"\n{} Change detected, re-running...\n",
1156-
"↻".cyan().bold()
1157-
);
1166+
println!("\n{} Change detected, re-running...\n", "↻".cyan().bold());
11581167
let _ = run_watchable(&subcommand, root, config_path, quiet);
1159-
println!(
1160-
"\n{} Watching for changes...",
1161-
"👀".to_string().dimmed()
1162-
);
1168+
println!("\n{} Watching for changes...", "👀".to_string().dimmed());
11631169
}
11641170
}
11651171
Ok(Err(error)) => {

crates/affected-core/src/detect.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,11 @@ mod tests {
411411
#[test]
412412
fn test_detect_dotnet_solution() {
413413
let dir = tempfile::tempdir().unwrap();
414-
std::fs::write(dir.path().join("MySolution.sln"), "Microsoft Visual Studio Solution File").unwrap();
414+
std::fs::write(
415+
dir.path().join("MySolution.sln"),
416+
"Microsoft Visual Studio Solution File",
417+
)
418+
.unwrap();
415419

416420
let ecosystems = detect_ecosystems(dir.path()).unwrap();
417421
assert!(ecosystems.contains(&Ecosystem::Dotnet));
@@ -465,7 +469,11 @@ mod tests {
465469
#[test]
466470
fn test_detect_elixir_umbrella() {
467471
let dir = tempfile::tempdir().unwrap();
468-
std::fs::write(dir.path().join("mix.exs"), "defmodule Root.MixProject do\nend").unwrap();
472+
std::fs::write(
473+
dir.path().join("mix.exs"),
474+
"defmodule Root.MixProject do\nend",
475+
)
476+
.unwrap();
469477
std::fs::create_dir_all(dir.path().join("apps")).unwrap();
470478

471479
let ecosystems = detect_ecosystems(dir.path()).unwrap();

crates/affected-core/src/resolvers/bun.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,8 @@ mod tests {
306306

307307
let graph = BunResolver.resolve(dir.path()).unwrap();
308308
assert_eq!(graph.packages.len(), 2);
309-
assert!(graph
310-
.packages
311-
.contains_key(&PackageId("@app/pkg-a".into())));
312-
assert!(graph
313-
.packages
314-
.contains_key(&PackageId("@app/pkg-b".into())));
309+
assert!(graph.packages.contains_key(&PackageId("@app/pkg-a".into())));
310+
assert!(graph.packages.contains_key(&PackageId("@app/pkg-b".into())));
315311

316312
// pkg-a depends on pkg-b
317313
assert!(graph.edges.contains(&(

crates/affected-core/src/resolvers/dart.rs

Lines changed: 23 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,7 @@ impl Resolver for DartResolver {
187187

188188
for dep_name in all_deps {
189189
if workspace_names.contains(dep_name.as_str()) {
190-
edges.push((
191-
PackageId(from_name.clone()),
192-
PackageId(dep_name),
193-
));
190+
edges.push((PackageId(from_name.clone()), PackageId(dep_name)));
194191
}
195192
}
196193
}
@@ -252,8 +249,8 @@ impl DartResolver {
252249
/// ```
253250
fn resolve_workspace(&self, root: &Path) -> Result<Vec<PathBuf>> {
254251
let pubspec_path = root.join("pubspec.yaml");
255-
let content = std::fs::read_to_string(&pubspec_path)
256-
.context("Failed to read root pubspec.yaml")?;
252+
let content =
253+
std::fs::read_to_string(&pubspec_path).context("Failed to read root pubspec.yaml")?;
257254

258255
let mut dirs = Vec::new();
259256
let mut in_workspace = false;
@@ -302,8 +299,7 @@ impl DartResolver {
302299
/// ```
303300
fn resolve_melos(&self, root: &Path) -> Result<Vec<PathBuf>> {
304301
let melos_path = root.join("melos.yaml");
305-
let content = std::fs::read_to_string(&melos_path)
306-
.context("Failed to read melos.yaml")?;
302+
let content = std::fs::read_to_string(&melos_path).context("Failed to read melos.yaml")?;
307303

308304
let mut globs = Vec::new();
309305
let mut in_packages = false;
@@ -423,11 +419,7 @@ mod tests {
423419
)
424420
.unwrap();
425421

426-
std::fs::write(
427-
dir.join("pubspec.yaml"),
428-
"name: my_project\n",
429-
)
430-
.unwrap();
422+
std::fs::write(dir.join("pubspec.yaml"), "name: my_project\n").unwrap();
431423

432424
// packages/alpha
433425
std::fs::create_dir_all(dir.join("packages/alpha")).unwrap();
@@ -440,11 +432,7 @@ mod tests {
440432

441433
// packages/beta
442434
std::fs::create_dir_all(dir.join("packages/beta")).unwrap();
443-
std::fs::write(
444-
dir.join("packages/beta/pubspec.yaml"),
445-
"name: beta\n",
446-
)
447-
.unwrap();
435+
std::fs::write(dir.join("packages/beta/pubspec.yaml"), "name: beta\n").unwrap();
448436
}
449437

450438
#[test]
@@ -467,18 +455,10 @@ mod tests {
467455

468456
// Two subdirs with pubspec.yaml, no workspace key, no melos.yaml
469457
std::fs::create_dir_all(dir.path().join("app_a")).unwrap();
470-
std::fs::write(
471-
dir.path().join("app_a/pubspec.yaml"),
472-
"name: app_a\n",
473-
)
474-
.unwrap();
458+
std::fs::write(dir.path().join("app_a/pubspec.yaml"), "name: app_a\n").unwrap();
475459

476460
std::fs::create_dir_all(dir.path().join("app_b")).unwrap();
477-
std::fs::write(
478-
dir.path().join("app_b/pubspec.yaml"),
479-
"name: app_b\n",
480-
)
481-
.unwrap();
461+
std::fs::write(dir.path().join("app_b/pubspec.yaml"), "name: app_b\n").unwrap();
482462

483463
assert!(DartResolver.detect(dir.path()));
484464
}
@@ -491,11 +471,7 @@ mod tests {
491471

492472
// Single pubspec.yaml without workspace key is not enough
493473
let dir2 = tempfile::tempdir().unwrap();
494-
std::fs::write(
495-
dir2.path().join("pubspec.yaml"),
496-
"name: solo_app\n",
497-
)
498-
.unwrap();
474+
std::fs::write(dir2.path().join("pubspec.yaml"), "name: solo_app\n").unwrap();
499475
assert!(!DartResolver.detect(dir2.path()));
500476

501477
// Single subdir with pubspec.yaml is not enough for generic mode
@@ -522,10 +498,9 @@ mod tests {
522498
assert!(graph.packages.contains_key(&PackageId("api".into())));
523499

524500
// api depends on core
525-
assert!(graph.edges.contains(&(
526-
PackageId("api".into()),
527-
PackageId("core".into()),
528-
)));
501+
assert!(graph
502+
.edges
503+
.contains(&(PackageId("api".into()), PackageId("core".into()),)));
529504

530505
// Verify paths
531506
let core_pkg = &graph.packages[&PackageId("core".into())];
@@ -548,10 +523,9 @@ mod tests {
548523
assert!(graph.packages.contains_key(&PackageId("beta".into())));
549524

550525
// alpha depends on beta
551-
assert!(graph.edges.contains(&(
552-
PackageId("alpha".into()),
553-
PackageId("beta".into()),
554-
)));
526+
assert!(graph
527+
.edges
528+
.contains(&(PackageId("alpha".into()), PackageId("beta".into()),)));
555529
}
556530

557531
#[test]
@@ -614,18 +588,13 @@ flutter:
614588
.unwrap();
615589

616590
std::fs::create_dir_all(dir.path().join("pkg_b")).unwrap();
617-
std::fs::write(
618-
dir.path().join("pkg_b/pubspec.yaml"),
619-
"name: pkg_b\n",
620-
)
621-
.unwrap();
591+
std::fs::write(dir.path().join("pkg_b/pubspec.yaml"), "name: pkg_b\n").unwrap();
622592

623593
let graph = DartResolver.resolve(dir.path()).unwrap();
624594
assert_eq!(graph.packages.len(), 2);
625-
assert!(graph.edges.contains(&(
626-
PackageId("pkg_a".into()),
627-
PackageId("pkg_b".into()),
628-
)));
595+
assert!(graph
596+
.edges
597+
.contains(&(PackageId("pkg_a".into()), PackageId("pkg_b".into()),)));
629598
}
630599

631600
#[test]
@@ -639,11 +608,7 @@ flutter:
639608
.unwrap();
640609

641610
std::fs::create_dir_all(dir.path().join("packages/lib")).unwrap();
642-
std::fs::write(
643-
dir.path().join("packages/lib/pubspec.yaml"),
644-
"name: lib\n",
645-
)
646-
.unwrap();
611+
std::fs::write(dir.path().join("packages/lib/pubspec.yaml"), "name: lib\n").unwrap();
647612

648613
std::fs::create_dir_all(dir.path().join("packages/app")).unwrap();
649614
std::fs::write(
@@ -654,9 +619,8 @@ flutter:
654619
.unwrap();
655620

656621
let graph = DartResolver.resolve(dir.path()).unwrap();
657-
assert!(graph.edges.contains(&(
658-
PackageId("app".into()),
659-
PackageId("lib".into()),
660-
)));
622+
assert!(graph
623+
.edges
624+
.contains(&(PackageId("app".into()), PackageId("lib".into()),)));
661625
}
662626
}

0 commit comments

Comments
 (0)