Format native builder and satisfy clippy

1 files changed, 43 insertions, 20 deletions

diff --git a/tests/rootfs_finalization.rs b/tests/rootfs_finalization.rs
index a450b7e..9e07436 100644
--- a/tests/rootfs_finalization.rs
+++ b/tests/rootfs_finalization.rs
@@ -10,7 +10,8 @@ fn finalization_copies_trees_generates_oem_recipe_and_enables_services() {
     let fixture = tempdir().expect("fixture directory");
     let source = fixture.path().join("overlay");
     fs::create_dir_all(source.join("nested")).expect("create source tree");
-    fs::write(source.join("nested/controller.conf"), "mode = controller\n").expect("write source file");
+    fs::write(source.join("nested/controller.conf"), "mode = controller\n")
+        .expect("write source file");
     symlink("nested/controller.conf", source.join("controller.conf"))
         .expect("create relative source symlink");
 
@@ -29,7 +30,8 @@ fn finalization_copies_trees_generates_oem_recipe_and_enables_services() {
         "mode = controller\n"
     );
     assert_eq!(
-        fs::read_link(rootfs.path().join("etc/controller/controller.conf")).expect("copied symlink"),
+        fs::read_link(rootfs.path().join("etc/controller/controller.conf"))
+            .expect("copied symlink"),
         Path::new("nested/controller.conf")
     );
     assert_eq!(
@@ -94,11 +96,16 @@ fn finalization_is_idempotent_for_matching_symlinks() {
         vec![ServiceName::new("chronyd.service").expect("valid service")],
     );
 
-    finalization.apply(rootfs.path()).expect("first finalization succeeds");
-    let second = finalization.apply(rootfs.path()).expect("repeat finalization succeeds");
+    finalization
+        .apply(rootfs.path())
+        .expect("first finalization succeeds");
+    let second = finalization
+        .apply(rootfs.path())
+        .expect("repeat finalization succeeds");
 
     assert_eq!(
-        fs::read_link(rootfs.path().join("etc/controller/controller-link")).expect("copied symlink"),
+        fs::read_link(rootfs.path().join("etc/controller/controller-link"))
+            .expect("copied symlink"),
         Path::new("controller.conf")
     );
     assert_eq!(
@@ -110,10 +117,12 @@ fn finalization_is_idempotent_for_matching_symlinks() {
         .expect("enabled service"),
         Path::new("/usr/lib/systemd/system/chronyd.service")
     );
-    assert!(second
-        .created_paths()
-        .iter()
-        .any(|path| path == "etc/controller/controller-link"));
+    assert!(
+        second
+            .created_paths()
+            .iter()
+            .any(|path| path == "etc/controller/controller-link")
+    );
 }
 
 #[test]
@@ -121,29 +130,43 @@ fn finalization_replaces_a_destination_symlink_instead_of_following_it() {
     let fixture = tempdir().expect("fixture directory");
     let source = fixture.path().join("overlay");
     fs::create_dir_all(&source).expect("create source tree");
-    fs::write(source.join("controller.conf"), "new controller configuration\n")
-        .expect("write source file");
+    fs::write(
+        source.join("controller.conf"),
+        "new controller configuration\n",
+    )
+    .expect("write source file");
     let rootfs = tempdir().expect("rootfs directory");
     let outside = fixture.path().join("outside.conf");
     fs::write(&outside, "must not change\n").expect("write outside file");
     fs::create_dir_all(rootfs.path().join("etc/controller")).expect("create destination directory");
-    symlink(&outside, rootfs.path().join("etc/controller/controller.conf"))
-        .expect("create destination symlink");
+    symlink(
+        &outside,
+        rootfs.path().join("etc/controller/controller.conf"),
+    )
+    .expect("create destination symlink");
     let finalization = RootfsFinalization::new(
         vec![CopyTree::new(&source, "etc/controller").expect("valid copy destination")],
         InitrdOem::new(std::iter::empty::<&str>(), std::iter::empty::<&str>()),
         vec![],
     );
 
-    finalization.apply(rootfs.path()).expect("finalization replaces symlink safely");
+    finalization
+        .apply(rootfs.path())
+        .expect("finalization replaces symlink safely");
 
-    assert_eq!(fs::read_to_string(&outside).expect("read outside file"), "must not change\n");
-    assert!(fs::symlink_metadata(rootfs.path().join("etc/controller/controller.conf"))
-        .expect("inspect copied file")
-        .file_type()
-        .is_file());
     assert_eq!(
-        fs::read_to_string(rootfs.path().join("etc/controller/controller.conf")).expect("read copied file"),
+        fs::read_to_string(&outside).expect("read outside file"),
+        "must not change\n"
+    );
+    assert!(
+        fs::symlink_metadata(rootfs.path().join("etc/controller/controller.conf"))
+            .expect("inspect copied file")
+            .file_type()
+            .is_file()
+    );
+    assert_eq!(
+        fs::read_to_string(rootfs.path().join("etc/controller/controller.conf"))
+            .expect("read copied file"),
         "new controller configuration\n"
     );
 }