Remove extra testdata/tree directory (#167)

sourcefrog · Nov 25, 2023 · c9f2210 · c9f2210
2 parents fff4987 + 6373cc7
commit c9f2210
Show file tree

Hide file tree

Showing 143 changed files with 159 additions and 161 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ When the tests run, `cargo test` runs a test suite binary from `target`, which t
 
 As a result, attaching a debugger to the test binary will let you see the code that launches the subprocess and that inspects the output, but it won't let you step through cargo-mutants itself, which is probably the most interesting part.
 
-Probably the easiest path is to just make note of the command run by the test, and then run that command yourself, under a debugger, outside of the test suite. For example, `./target/debug/cargo-mutants -d ./testdata/tree/factorial --list`.
+Probably the easiest path is to just make note of the command run by the test, and then run that command yourself, under a debugger, outside of the test suite. For example, `./target/debug/cargo-mutants -d ./testdata/factorial --list`.
 
 You may wish to turn off the timeouts with `-t 0`.
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -98,35 +98,35 @@ resolver = "2"
 # so that support for testing workspaces does not try to test the whole
 # cargo-mutants tree.
 exclude = [
-    "testdata/tree/already_failing_tests",
-    "testdata/tree/already_hangs",
-    "testdata/tree/cdylib",
-    "testdata/tree/cfg_attr_mutants_skip",
-    "testdata/tree/cfg_attr_test_skip",
-    "testdata/tree/dependency",
-    "testdata/tree/diff0",
-    "testdata/tree/diff1",
-    "testdata/tree/error_value",
-    "testdata/tree/everything_skipped",
-    "testdata/tree/factorial",
-    "testdata/tree/fails_without_feature",
-    "testdata/tree/hang_avoided_by_attr/",
-    "testdata/tree/hang_when_mutated",
-    "testdata/tree/insta",
-    "testdata/tree/integration_tests",
-    "testdata/tree/missing_test",
-    "testdata/tree/mut_ref",
-    "testdata/tree/never_type",
-    "testdata/tree/override_dependency",
-    "testdata/tree/package-fails/",
-    "testdata/tree/patch_dependency",
-    "testdata/tree/relative_dependency",
-    "testdata/tree/replace_dependency",
-    "testdata/tree/small_well_tested",
-    "testdata/tree/strict_warnings",
-    "testdata/tree/struct_with_no_default",
-    "testdata/tree/unapply",
-    "testdata/tree/unsafe",
-    "testdata/tree/well_tested",
-    "testdata/tree/with_child_directories",
+    "testdata/already_failing_tests",
+    "testdata/already_hangs",
+    "testdata/cdylib",
+    "testdata/cfg_attr_mutants_skip",
+    "testdata/cfg_attr_test_skip",
+    "testdata/dependency",
+    "testdata/diff0",
+    "testdata/diff1",
+    "testdata/error_value",
+    "testdata/everything_skipped",
+    "testdata/factorial",
+    "testdata/fails_without_feature",
+    "testdata/hang_avoided_by_attr/",
+    "testdata/hang_when_mutated",
+    "testdata/insta",
+    "testdata/integration_tests",
+    "testdata/missing_test",
+    "testdata/mut_ref",
+    "testdata/never_type",
+    "testdata/override_dependency",
+    "testdata/package-fails/",
+    "testdata/patch_dependency",
+    "testdata/relative_dependency",
+    "testdata/replace_dependency",
+    "testdata/small_well_tested",
+    "testdata/strict_warnings",
+    "testdata/struct_with_no_default",
+    "testdata/unapply",
+    "testdata/unsafe",
+    "testdata/well_tested",
+    "testdata/with_child_directories",
 ]
diff --git a/DESIGN.md b/DESIGN.md
@@ -188,7 +188,7 @@ Cargo-mutants is primarily tested on its public interface, which is the command
 
 ### `testdata` trees
 
-The primary means of testing is Rust source trees under `testdata/tree`: you can copy an existing tree and modify it to show the new behavior that you want to test.
+The primary means of testing is Rust source trees under `testdata`: you can copy an existing tree and modify it to show the new behavior that you want to test.
 
 A selection of test trees are available for testing different scenarios. If there is an existing suitable tree, please use it. If you need to test a situation that is not covered yet, please add a new tree.
 

diff --git a/src/build_dir.rs b/src/build_dir.rs
@@ -152,7 +152,7 @@ mod test {
     #[test]
     fn build_dir_debug_form() {
         let options = Options::default();
-        let workspace = Workspace::open("testdata/tree/factorial").unwrap();
+        let workspace = Workspace::open("testdata/factorial").unwrap();
         let build_dir = BuildDir::new(&workspace.dir, &options, &Console::new()).unwrap();
         let debug_form = format!("{build_dir:?}");
         assert!(

diff --git a/src/in_diff.rs b/src/in_diff.rs
@@ -335,8 +335,8 @@ index eb42779..a0091b7 100644
 
     #[test]
     fn reconstruct_partial_new_file() {
-        let old = read_to_string("testdata/tree/diff0/src/lib.rs").unwrap();
-        let new = read_to_string("testdata/tree/diff1/src/lib.rs").unwrap();
+        let old = read_to_string("testdata/diff0/src/lib.rs").unwrap();
+        let new = read_to_string("testdata/diff1/src/lib.rs").unwrap();
         let diff = make_diff(&old, &new);
         let patch = Patch::from_single(&diff).unwrap();
         let reconstructed = partial_new_file(&patch);

diff --git a/src/manifest.rs b/src/manifest.rs
@@ -165,7 +165,7 @@ mod test {
 
     #[test]
     fn fix_path_absolute_unchanged() {
-        let dependency_abspath = Utf8Path::new("testdata/tree/dependency")
+        let dependency_abspath = Utf8Path::new("testdata/dependency")
             .canonicalize_utf8()
             .unwrap();
         assert_eq!(
@@ -181,13 +181,13 @@ mod test {
     fn fix_path_relative() {
         let fixed_path: Utf8PathBuf = super::fix_path(
             "../dependency",
-            Utf8Path::new("testdata/tree/relative_dependency"),
+            Utf8Path::new("testdata/relative_dependency"),
         )
         .expect("path was adjusted")
         .into();
         assert_eq!(
             &fixed_path,
-            Utf8Path::new("testdata/tree/relative_dependency/../dependency"),
+            Utf8Path::new("testdata/relative_dependency/../dependency"),
         );
     }
 

diff --git a/src/mutate.rs b/src/mutate.rs
@@ -208,7 +208,7 @@ mod test {
 
     #[test]
     fn discover_factorial_mutants() {
-        let tree_path = Utf8Path::new("testdata/tree/factorial");
+        let tree_path = Utf8Path::new("testdata/factorial");
         let workspace = Workspace::open(tree_path).unwrap();
         let options = Options::default();
         let mutants = workspace
@@ -262,7 +262,7 @@ mod test {
 
     #[test]
     fn filter_by_attributes() {
-        let mutants = Workspace::open(Utf8Path::new("testdata/tree/hang_avoided_by_attr"))
+        let mutants = Workspace::open(Utf8Path::new("testdata/hang_avoided_by_attr"))
             .unwrap()
             .mutants(&PackageFilter::All, &Options::default(), &Console::new())
             .unwrap();
@@ -275,7 +275,7 @@ mod test {
 
     #[test]
     fn mutate_factorial() -> Result<()> {
-        let tree_path = Utf8Path::new("testdata/tree/factorial");
+        let tree_path = Utf8Path::new("testdata/factorial");
         let mutants = Workspace::open(tree_path)?.mutants(
             &PackageFilter::All,
             &Options::default(),

diff --git a/src/workspace.rs b/src/workspace.rs
@@ -317,8 +317,8 @@ mod test {
 
     #[test]
     fn open_subdirectory_of_crate_opens_the_crate() {
-        let workspace = Workspace::open("testdata/tree/factorial/src")
-            .expect("open source tree from subdirectory");
+        let workspace =
+            Workspace::open("testdata/factorial/src").expect("open source tree from subdirectory");
         let root = &workspace.dir;
         assert!(root.is_dir());
         assert!(root.join("Cargo.toml").is_file());
@@ -328,16 +328,15 @@ mod test {
 
     #[test]
     fn find_root_from_subdirectory_of_workspace_finds_the_workspace_root() {
-        let root = Workspace::open("testdata/tree/workspace/main")
+        let root = Workspace::open("testdata/workspace/main")
             .expect("Find root from within workspace/main")
             .dir;
         assert_eq!(root.file_name(), Some("workspace"), "Wrong root: {root:?}");
     }
 
     #[test]
     fn find_top_source_files_from_subdirectory_of_workspace() {
-        let workspace =
-            Workspace::open("testdata/tree/workspace/main").expect("Find workspace root");
+        let workspace = Workspace::open("testdata/workspace/main").expect("Find workspace root");
         assert_eq!(
             workspace
                 .packages(&PackageFilter::All)
@@ -361,7 +360,7 @@ mod test {
 
     #[test]
     fn package_filter_all_from_subdir_gets_everything() {
-        let subdir_path = Utf8Path::new("testdata/tree/workspace/main");
+        let subdir_path = Utf8Path::new("testdata/workspace/main");
         let workspace = Workspace::open(subdir_path).expect("Find workspace root");
         let packages = workspace.packages(&PackageFilter::All).unwrap();
         assert_eq!(
@@ -372,7 +371,7 @@ mod test {
 
     #[test]
     fn auto_packages_in_workspace_subdir_finds_single_package() {
-        let subdir_path = Utf8Path::new("testdata/tree/workspace/main");
+        let subdir_path = Utf8Path::new("testdata/workspace/main");
         let workspace = Workspace::open(subdir_path).expect("Find workspace root");
         let packages = workspace
             .packages(&PackageFilter::Auto(subdir_path.to_owned()))
@@ -382,7 +381,7 @@ mod test {
 
     #[test]
     fn auto_packages_in_virtual_workspace_gets_everything() {
-        let path = Utf8Path::new("testdata/tree/workspace");
+        let path = Utf8Path::new("testdata/workspace");
         let workspace = Workspace::open(path).expect("Find workspace root");
         let packages = workspace
             .packages(&PackageFilter::Auto(path.to_owned()))
@@ -395,8 +394,7 @@ mod test {
 
     #[test]
     fn filter_by_single_package() {
-        let workspace =
-            Workspace::open("testdata/tree/workspace/main").expect("Find workspace root");
+        let workspace = Workspace::open("testdata/workspace/main").expect("Find workspace root");
         let root_dir = &workspace.dir;
         assert_eq!(
             root_dir.file_name(),
@@ -426,7 +424,7 @@ mod test {
 
     #[test]
     fn filter_by_multiple_packages() {
-        let workspace = Workspace::open("testdata/tree/workspace/main").unwrap();
+        let workspace = Workspace::open("testdata/workspace/main").unwrap();
         assert_eq!(
             workspace.dir.file_name(),
             Some("workspace"),

diff --git a/testdata/tree/.gitignore → testdata/.gitignore b/testdata/tree/.gitignore → testdata/.gitignore
diff --git a/.../tree/already_failing_doctests/Cargo.toml → testdata/already_failing_doctests/Cargo.toml b/.../tree/already_failing_doctests/Cargo.toml → testdata/already_failing_doctests/Cargo.toml
diff --git a/.../tree/already_failing_doctests/src/lib.rs → testdata/already_failing_doctests/src/lib.rs b/.../tree/already_failing_doctests/src/lib.rs → testdata/already_failing_doctests/src/lib.rs
diff --git a/...ata/tree/already_failing_tests/Cargo.toml → testdata/already_failing_tests/Cargo.toml b/...ata/tree/already_failing_tests/Cargo.toml → testdata/already_failing_tests/Cargo.toml
diff --git a/...ata/tree/already_failing_tests/src/lib.rs → testdata/already_failing_tests/src/lib.rs b/...ata/tree/already_failing_tests/src/lib.rs → testdata/already_failing_tests/src/lib.rs
diff --git a/testdata/tree/already_hangs/Cargo.toml → testdata/already_hangs/Cargo.toml b/testdata/tree/already_hangs/Cargo.toml → testdata/already_hangs/Cargo.toml
diff --git a/testdata/tree/already_hangs/src/lib.rs → testdata/already_hangs/src/lib.rs b/testdata/tree/already_hangs/src/lib.rs → testdata/already_hangs/src/lib.rs
diff --git a/testdata/tree/cdylib/Cargo.toml → testdata/cdylib/Cargo.toml b/testdata/tree/cdylib/Cargo.toml → testdata/cdylib/Cargo.toml
diff --git a/testdata/tree/cdylib/README.md → testdata/cdylib/README.md b/testdata/tree/cdylib/README.md → testdata/cdylib/README.md
diff --git a/testdata/tree/cdylib/src/entry.rs → testdata/cdylib/src/entry.rs b/testdata/tree/cdylib/src/entry.rs → testdata/cdylib/src/entry.rs
diff --git a/...ata/tree/cfg_attr_mutants_skip/Cargo.toml → testdata/cfg_attr_mutants_skip/Cargo.toml b/...ata/tree/cfg_attr_mutants_skip/Cargo.toml → testdata/cfg_attr_mutants_skip/Cargo.toml
diff --git a/...ata/tree/cfg_attr_mutants_skip/src/lib.rs → testdata/cfg_attr_mutants_skip/src/lib.rs b/...ata/tree/cfg_attr_mutants_skip/src/lib.rs → testdata/cfg_attr_mutants_skip/src/lib.rs
diff --git a/testdata/tree/cfg_attr_test_skip/Cargo.toml → testdata/cfg_attr_test_skip/Cargo.toml b/testdata/tree/cfg_attr_test_skip/Cargo.toml → testdata/cfg_attr_test_skip/Cargo.toml
diff --git a/testdata/tree/cfg_attr_test_skip/src/lib.rs → testdata/cfg_attr_test_skip/src/lib.rs b/testdata/tree/cfg_attr_test_skip/src/lib.rs → testdata/cfg_attr_test_skip/src/lib.rs
diff --git a/testdata/tree/dependency/Cargo.toml → testdata/dependency/Cargo.toml b/testdata/tree/dependency/Cargo.toml → testdata/dependency/Cargo.toml
diff --git a/testdata/tree/dependency/src/lib.rs → testdata/dependency/src/lib.rs b/testdata/tree/dependency/src/lib.rs → testdata/dependency/src/lib.rs
diff --git a/testdata/tree/diff0/Cargo.toml → testdata/diff0/Cargo.toml b/testdata/tree/diff0/Cargo.toml → testdata/diff0/Cargo.toml
diff --git a/testdata/tree/diff0/src/lib.rs → testdata/diff0/src/lib.rs b/testdata/tree/diff0/src/lib.rs → testdata/diff0/src/lib.rs
diff --git a/testdata/tree/diff1/Cargo.toml → testdata/diff1/Cargo.toml b/testdata/tree/diff1/Cargo.toml → testdata/diff1/Cargo.toml
diff --git a/testdata/tree/diff1/src/lib.rs → testdata/diff1/src/lib.rs b/testdata/tree/diff1/src/lib.rs → testdata/diff1/src/lib.rs
diff --git a/...data/tree/error_value/.cargo/mutants.toml → testdata/error_value/.cargo/mutants.toml b/...data/tree/error_value/.cargo/mutants.toml → testdata/error_value/.cargo/mutants.toml
diff --git a/testdata/tree/error_value/Cargo.toml → testdata/error_value/Cargo.toml b/testdata/tree/error_value/Cargo.toml → testdata/error_value/Cargo.toml
diff --git a/testdata/tree/error_value/README.md → testdata/error_value/README.md b/testdata/tree/error_value/README.md → testdata/error_value/README.md
diff --git a/testdata/tree/error_value/src/lib.rs → testdata/error_value/src/lib.rs b/testdata/tree/error_value/src/lib.rs → testdata/error_value/src/lib.rs
diff --git a/testdata/tree/everything_skipped/Cargo.toml → testdata/everything_skipped/Cargo.toml b/testdata/tree/everything_skipped/Cargo.toml → testdata/everything_skipped/Cargo.toml
diff --git a/...ing_skipped/src/bin/everything-skipped.rs → ...ing_skipped/src/bin/everything-skipped.rs b/...ing_skipped/src/bin/everything-skipped.rs → ...ing_skipped/src/bin/everything-skipped.rs
diff --git a/testdata/tree/factorial/Cargo.toml → testdata/factorial/Cargo.toml b/testdata/tree/factorial/Cargo.toml → testdata/factorial/Cargo.toml
diff --git a/testdata/tree/factorial/src/bin/factorial.rs → testdata/factorial/src/bin/factorial.rs b/testdata/tree/factorial/src/bin/factorial.rs → testdata/factorial/src/bin/factorial.rs
diff --git a/...ata/tree/fails_without_feature/Cargo.toml → testdata/fails_without_feature/Cargo.toml b/...ata/tree/fails_without_feature/Cargo.toml → testdata/fails_without_feature/Cargo.toml
diff --git a/...data/tree/fails_without_feature/README.md → testdata/fails_without_feature/README.md b/...data/tree/fails_without_feature/README.md → testdata/fails_without_feature/README.md
diff --git a/...ails_without_feature/src/bin/factorial.rs → ...ails_without_feature/src/bin/factorial.rs b/...ails_without_feature/src/bin/factorial.rs → ...ails_without_feature/src/bin/factorial.rs
diff --git a/...data/tree/hang_avoided_by_attr/Cargo.toml → testdata/hang_avoided_by_attr/Cargo.toml b/...data/tree/hang_avoided_by_attr/Cargo.toml → testdata/hang_avoided_by_attr/Cargo.toml
diff --git a/...data/tree/hang_avoided_by_attr/src/lib.rs → testdata/hang_avoided_by_attr/src/lib.rs b/...data/tree/hang_avoided_by_attr/src/lib.rs → testdata/hang_avoided_by_attr/src/lib.rs
diff --git a/testdata/tree/hang_when_mutated/Cargo.toml → testdata/hang_when_mutated/Cargo.toml b/testdata/tree/hang_when_mutated/Cargo.toml → testdata/hang_when_mutated/Cargo.toml
diff --git a/testdata/tree/hang_when_mutated/src/lib.rs → testdata/hang_when_mutated/src/lib.rs b/testdata/tree/hang_when_mutated/src/lib.rs → testdata/hang_when_mutated/src/lib.rs
diff --git a/testdata/tree/insta/Cargo.toml → testdata/insta/Cargo.toml b/testdata/tree/insta/Cargo.toml → testdata/insta/Cargo.toml
diff --git a/testdata/tree/insta/README.md → testdata/insta/README.md b/testdata/tree/insta/README.md → testdata/insta/README.md
diff --git a/testdata/tree/insta/src/lib.rs → testdata/insta/src/lib.rs b/testdata/tree/insta/src/lib.rs → testdata/insta/src/lib.rs
diff --git a/testdata/tree/insta/tests/insta.rs → testdata/insta/tests/insta.rs b/testdata/tree/insta/tests/insta.rs → testdata/insta/tests/insta.rs
diff --git a/...s/insta__say_hello_vs_insta_snapshot.snap → ...s/insta__say_hello_vs_insta_snapshot.snap b/...s/insta__say_hello_vs_insta_snapshot.snap → ...s/insta__say_hello_vs_insta_snapshot.snap
diff --git a/testdata/tree/integration_tests/Cargo.toml → testdata/integration_tests/Cargo.toml b/testdata/tree/integration_tests/Cargo.toml → testdata/integration_tests/Cargo.toml
diff --git a/testdata/tree/integration_tests/README.md → testdata/integration_tests/README.md b/testdata/tree/integration_tests/README.md → testdata/integration_tests/README.md
diff --git a/testdata/tree/integration_tests/src/lib.rs → testdata/integration_tests/src/lib.rs b/testdata/tree/integration_tests/src/lib.rs → testdata/integration_tests/src/lib.rs
diff --git a/testdata/tree/integration_tests/tests/api.rs → testdata/integration_tests/tests/api.rs b/testdata/tree/integration_tests/tests/api.rs → testdata/integration_tests/tests/api.rs
diff --git a/testdata/tree/missing_test/Cargo.toml → testdata/missing_test/Cargo.toml b/testdata/tree/missing_test/Cargo.toml → testdata/missing_test/Cargo.toml
diff --git a/testdata/tree/missing_test/src/lib.rs → testdata/missing_test/src/lib.rs b/testdata/tree/missing_test/src/lib.rs → testdata/missing_test/src/lib.rs
diff --git a/testdata/tree/mut_ref/Cargo.toml → testdata/mut_ref/Cargo.toml b/testdata/tree/mut_ref/Cargo.toml → testdata/mut_ref/Cargo.toml
diff --git a/testdata/tree/mut_ref/README.md → testdata/mut_ref/README.md b/testdata/tree/mut_ref/README.md → testdata/mut_ref/README.md
diff --git a/testdata/tree/mut_ref/src/lib.rs → testdata/mut_ref/src/lib.rs b/testdata/tree/mut_ref/src/lib.rs → testdata/mut_ref/src/lib.rs
diff --git a/testdata/tree/never_type/Cargo.toml → testdata/never_type/Cargo.toml b/testdata/tree/never_type/Cargo.toml → testdata/never_type/Cargo.toml
diff --git a/testdata/tree/never_type/src/lib.rs → testdata/never_type/src/lib.rs b/testdata/tree/never_type/src/lib.rs → testdata/never_type/src/lib.rs
diff --git a/testdata/tree/nightly_only/Cargo.toml → testdata/nightly_only/Cargo.toml b/testdata/tree/nightly_only/Cargo.toml → testdata/nightly_only/Cargo.toml
diff --git a/testdata/tree/nightly_only/README.md → testdata/nightly_only/README.md b/testdata/tree/nightly_only/README.md → testdata/nightly_only/README.md
@@ -5,11 +5,11 @@ mutants` uses the corresponding `cargo` and `rustc` when building candidates.
 
 For example this should fail:
 
-    cargo +stable mutants -d ./testdata/tree/nightly_only/
+    cargo +stable mutants -d ./testdata/nightly_only/
 
 and this should succeed:
 
-    cargo +nightly mutants -d ./testdata/tree/nightly_only/
+    cargo +nightly mutants -d ./testdata/nightly_only/
 
 This isn't covered by an integration test because there's no guarantee the user
 has both toolchains installed...
diff --git a/testdata/tree/nightly_only/src/lib.rs → testdata/nightly_only/src/lib.rs b/testdata/tree/nightly_only/src/lib.rs → testdata/nightly_only/src/lib.rs
diff --git a/testdata/override_dependency/.cargo/config.toml b/testdata/override_dependency/.cargo/config.toml
@@ -0,0 +1 @@
+paths = ["../../mutants_attrs"]
diff --git a/testdata/tree/override_dependency/Cargo.toml → testdata/override_dependency/Cargo.toml b/testdata/tree/override_dependency/Cargo.toml → testdata/override_dependency/Cargo.toml
diff --git a/testdata/tree/override_dependency/src/lib.rs → testdata/override_dependency/src/lib.rs b/testdata/tree/override_dependency/src/lib.rs → testdata/override_dependency/src/lib.rs
diff --git a/...ata/tree/override_dependency/tests/api.rs → testdata/override_dependency/tests/api.rs b/...ata/tree/override_dependency/tests/api.rs → testdata/override_dependency/tests/api.rs
diff --git a/testdata/tree/package_fails/Cargo.toml → testdata/package_fails/Cargo.toml b/testdata/tree/package_fails/Cargo.toml → testdata/package_fails/Cargo.toml
diff --git a/testdata/tree/package_fails/README.md → testdata/package_fails/README.md b/testdata/tree/package_fails/README.md → testdata/package_fails/README.md
diff --git a/...ata/tree/package_fails/failing/Cargo.toml → testdata/package_fails/failing/Cargo.toml b/...ata/tree/package_fails/failing/Cargo.toml → testdata/package_fails/failing/Cargo.toml
diff --git a/...ata/tree/package_fails/failing/src/lib.rs → testdata/package_fails/failing/src/lib.rs b/...ata/tree/package_fails/failing/src/lib.rs → testdata/package_fails/failing/src/lib.rs
diff --git a/...ata/tree/package_fails/passing/Cargo.toml → testdata/package_fails/passing/Cargo.toml b/...ata/tree/package_fails/passing/Cargo.toml → testdata/package_fails/passing/Cargo.toml
diff --git a/...ata/tree/package_fails/passing/src/lib.rs → testdata/package_fails/passing/src/lib.rs b/...ata/tree/package_fails/passing/src/lib.rs → testdata/package_fails/passing/src/lib.rs
diff --git a/testdata/tree/parse_fails/Cargo.toml → testdata/parse_fails/Cargo.toml b/testdata/tree/parse_fails/Cargo.toml → testdata/parse_fails/Cargo.toml
diff --git a/testdata/tree/parse_fails/src/lib.rs → testdata/parse_fails/src/lib.rs b/testdata/tree/parse_fails/src/lib.rs → testdata/parse_fails/src/lib.rs
diff --git a/testdata/tree/patch_dependency/Cargo.toml → testdata/patch_dependency/Cargo.toml b/testdata/tree/patch_dependency/Cargo.toml → testdata/patch_dependency/Cargo.toml
@@ -17,4 +17,4 @@ publish = false
 mutants = { version = "0" }
 
 [patch.crates-io]
-"mutants" = { path = "../../../mutants_attrs" }
+"mutants" = { path = "../../mutants_attrs" }
diff --git a/testdata/tree/patch_dependency/src/lib.rs → testdata/patch_dependency/src/lib.rs b/testdata/tree/patch_dependency/src/lib.rs → testdata/patch_dependency/src/lib.rs
diff --git a/testdata/tree/patch_dependency/tests/api.rs → testdata/patch_dependency/tests/api.rs b/testdata/tree/patch_dependency/tests/api.rs → testdata/patch_dependency/tests/api.rs
diff --git a/testdata/tree/relative_dependency/Cargo.toml → testdata/relative_dependency/Cargo.toml b/testdata/tree/relative_dependency/Cargo.toml → testdata/relative_dependency/Cargo.toml
diff --git a/testdata/tree/relative_dependency/src/lib.rs → testdata/relative_dependency/src/lib.rs b/testdata/tree/relative_dependency/src/lib.rs → testdata/relative_dependency/src/lib.rs
diff --git a/...ata/tree/relative_dependency/tests/api.rs → testdata/relative_dependency/tests/api.rs b/...ata/tree/relative_dependency/tests/api.rs → testdata/relative_dependency/tests/api.rs
diff --git a/testdata/tree/replace_dependency/Cargo.toml → testdata/replace_dependency/Cargo.toml b/testdata/tree/replace_dependency/Cargo.toml → testdata/replace_dependency/Cargo.toml
@@ -17,4 +17,4 @@ publish = false
 mutants = { version = "0" }
 
 [replace]
-"mutants:0.0.3" = { path = "../../../mutants_attrs" }
+"mutants:0.0.3" = { path = "../../mutants_attrs" }
diff --git a/testdata/tree/replace_dependency/src/lib.rs → testdata/replace_dependency/src/lib.rs b/testdata/tree/replace_dependency/src/lib.rs → testdata/replace_dependency/src/lib.rs
diff --git a/...data/tree/replace_dependency/tests/api.rs → testdata/replace_dependency/tests/api.rs b/...data/tree/replace_dependency/tests/api.rs → testdata/replace_dependency/tests/api.rs
diff --git a/testdata/tree/small_well_tested/Cargo.toml → testdata/small_well_tested/Cargo.toml b/testdata/tree/small_well_tested/Cargo.toml → testdata/small_well_tested/Cargo.toml
diff --git a/testdata/tree/small_well_tested/src/lib.rs → testdata/small_well_tested/src/lib.rs b/testdata/tree/small_well_tested/src/lib.rs → testdata/small_well_tested/src/lib.rs
diff --git a/testdata/tree/strict_warnings/Cargo.toml → testdata/strict_warnings/Cargo.toml b/testdata/tree/strict_warnings/Cargo.toml → testdata/strict_warnings/Cargo.toml
diff --git a/testdata/tree/strict_warnings/src/lib.rs → testdata/strict_warnings/src/lib.rs b/testdata/tree/strict_warnings/src/lib.rs → testdata/strict_warnings/src/lib.rs
diff --git a/...ta/tree/struct_with_no_default/Cargo.toml → testdata/struct_with_no_default/Cargo.toml b/...ta/tree/struct_with_no_default/Cargo.toml → testdata/struct_with_no_default/Cargo.toml
diff --git a/...ta/tree/struct_with_no_default/src/lib.rs → testdata/struct_with_no_default/src/lib.rs b/...ta/tree/struct_with_no_default/src/lib.rs → testdata/struct_with_no_default/src/lib.rs
diff --git a/testdata/tree/override_dependency/.cargo/config.toml b/testdata/tree/override_dependency/.cargo/config.toml
diff --git a/testdata/tree/typecheck_fails/Cargo.toml → testdata/typecheck_fails/Cargo.toml b/testdata/tree/typecheck_fails/Cargo.toml → testdata/typecheck_fails/Cargo.toml
diff --git a/testdata/tree/typecheck_fails/src/lib.rs → testdata/typecheck_fails/src/lib.rs b/testdata/tree/typecheck_fails/src/lib.rs → testdata/typecheck_fails/src/lib.rs
diff --git a/testdata/tree/unapply/Cargo.toml → testdata/unapply/Cargo.toml b/testdata/tree/unapply/Cargo.toml → testdata/unapply/Cargo.toml
diff --git a/testdata/tree/unapply/README.md → testdata/unapply/README.md b/testdata/tree/unapply/README.md → testdata/unapply/README.md
diff --git a/testdata/tree/unapply/src/a.rs → testdata/unapply/src/a.rs b/testdata/tree/unapply/src/a.rs → testdata/unapply/src/a.rs
diff --git a/testdata/tree/unapply/src/b.rs → testdata/unapply/src/b.rs b/testdata/tree/unapply/src/b.rs → testdata/unapply/src/b.rs
diff --git a/testdata/tree/unapply/src/c.rs → testdata/unapply/src/c.rs b/testdata/tree/unapply/src/c.rs → testdata/unapply/src/c.rs
diff --git a/testdata/tree/unapply/src/lib.rs → testdata/unapply/src/lib.rs b/testdata/tree/unapply/src/lib.rs → testdata/unapply/src/lib.rs
diff --git a/testdata/tree/unsafe/Cargo.toml → testdata/unsafe/Cargo.toml b/testdata/tree/unsafe/Cargo.toml → testdata/unsafe/Cargo.toml
diff --git a/testdata/tree/unsafe/src/lib.rs → testdata/unsafe/src/lib.rs b/testdata/tree/unsafe/src/lib.rs → testdata/unsafe/src/lib.rs
diff --git a/testdata/tree/well_tested/Cargo.toml → testdata/well_tested/Cargo.toml b/testdata/tree/well_tested/Cargo.toml → testdata/well_tested/Cargo.toml
diff --git a/testdata/tree/well_tested/README.md → testdata/well_tested/README.md b/testdata/tree/well_tested/README.md → testdata/well_tested/README.md
diff --git a/testdata/tree/well_tested/src/arc.rs → testdata/well_tested/src/arc.rs b/testdata/tree/well_tested/src/arc.rs → testdata/well_tested/src/arc.rs
diff --git a/testdata/tree/well_tested/src/empty_fns.rs → testdata/well_tested/src/empty_fns.rs b/testdata/tree/well_tested/src/empty_fns.rs → testdata/well_tested/src/empty_fns.rs
diff --git a/testdata/tree/well_tested/src/inside_mod.rs → testdata/well_tested/src/inside_mod.rs b/testdata/tree/well_tested/src/inside_mod.rs → testdata/well_tested/src/inside_mod.rs
diff --git a/testdata/tree/well_tested/src/item_mod.rs → testdata/well_tested/src/item_mod.rs b/testdata/tree/well_tested/src/item_mod.rs → testdata/well_tested/src/item_mod.rs
diff --git a/testdata/tree/well_tested/src/lib.rs → testdata/well_tested/src/lib.rs b/testdata/tree/well_tested/src/lib.rs → testdata/well_tested/src/lib.rs
diff --git a/testdata/tree/well_tested/src/methods.rs → testdata/well_tested/src/methods.rs b/testdata/tree/well_tested/src/methods.rs → testdata/well_tested/src/methods.rs
diff --git a/...a/tree/well_tested/src/nested_function.rs → testdata/well_tested/src/nested_function.rs b/...a/tree/well_tested/src/nested_function.rs → testdata/well_tested/src/nested_function.rs
diff --git a/testdata/tree/well_tested/src/numbers.rs → testdata/well_tested/src/numbers.rs b/testdata/tree/well_tested/src/numbers.rs → testdata/well_tested/src/numbers.rs
diff --git a/testdata/tree/well_tested/src/result.rs → testdata/well_tested/src/result.rs b/testdata/tree/well_tested/src/result.rs → testdata/well_tested/src/result.rs
diff --git a/testdata/tree/well_tested/src/sets.rs → testdata/well_tested/src/sets.rs b/testdata/tree/well_tested/src/sets.rs → testdata/well_tested/src/sets.rs
diff --git a/testdata/tree/well_tested/src/simple_fns.rs → testdata/well_tested/src/simple_fns.rs b/testdata/tree/well_tested/src/simple_fns.rs → testdata/well_tested/src/simple_fns.rs
diff --git a/testdata/tree/well_tested/src/slices.rs → testdata/well_tested/src/slices.rs b/testdata/tree/well_tested/src/slices.rs → testdata/well_tested/src/slices.rs
diff --git a/...e/well_tested/src/struct_with_lifetime.rs → ...a/well_tested/src/struct_with_lifetime.rs b/...e/well_tested/src/struct_with_lifetime.rs → ...a/well_tested/src/struct_with_lifetime.rs
diff --git a/...ta/tree/with_child_directories/Cargo.toml → testdata/with_child_directories/Cargo.toml b/...ta/tree/with_child_directories/Cargo.toml → testdata/with_child_directories/Cargo.toml
diff --git a/...ata/tree/with_child_directories/README.md → testdata/with_child_directories/README.md b/...ata/tree/with_child_directories/README.md → testdata/with_child_directories/README.md
diff --git a/...ta/tree/with_child_directories/src/lib.rs → testdata/with_child_directories/src/lib.rs b/...ta/tree/with_child_directories/src/lib.rs → testdata/with_child_directories/src/lib.rs
diff --git a/...ree/with_child_directories/src/methods.rs → ...ata/with_child_directories/src/methods.rs b/...ree/with_child_directories/src/methods.rs → ...ata/with_child_directories/src/methods.rs
diff --git a/...tree/with_child_directories/src/module.rs → ...data/with_child_directories/src/module.rs b/...tree/with_child_directories/src/module.rs → ...data/with_child_directories/src/module.rs
diff --git a/..._directories/src/module/module_methods.rs → ..._directories/src/module/module_methods.rs b/..._directories/src/module/module_methods.rs → ..._directories/src/module/module_methods.rs
diff --git a/...irectories/src/module/unreferenced_mod.rs → ...irectories/src/module/unreferenced_mod.rs b/...irectories/src/module/unreferenced_mod.rs → ...irectories/src/module/unreferenced_mod.rs
diff --git a/...irectories/src/module/utils/inside_mod.rs → ...irectories/src/module/utils/inside_mod.rs b/...irectories/src/module/utils/inside_mod.rs → ...irectories/src/module/utils/inside_mod.rs
diff --git a/...rc/module/utils/inside_utils_empty_fns.rs → ...rc/module/utils/inside_utils_empty_fns.rs b/...rc/module/utils/inside_utils_empty_fns.rs → ...rc/module/utils/inside_utils_empty_fns.rs
diff --git a/...child_directories/src/module/utils/mod.rs → ...child_directories/src/module/utils/mod.rs b/...child_directories/src/module/utils/mod.rs → ...child_directories/src/module/utils/mod.rs
diff --git a/...ories/src/module/utils/nested_function.rs → ...ories/src/module/utils/nested_function.rs b/...ories/src/module/utils/nested_function.rs → ...ories/src/module/utils/nested_function.rs
diff --git a/...ctories/src/module/utils/sub_utils/mod.rs → ...ctories/src/module/utils/sub_utils/mod.rs b/...ctories/src/module/utils/sub_utils/mod.rs → ...ctories/src/module/utils/sub_utils/mod.rs
diff --git a/...ils/sub_utils/subutils_nested_function.rs → ...ils/sub_utils/subutils_nested_function.rs b/...ils/sub_utils/subutils_nested_function.rs → ...ils/sub_utils/subutils_nested_function.rs
diff --git a/testdata/tree/workspace/Cargo.toml → testdata/workspace/Cargo.toml b/testdata/tree/workspace/Cargo.toml → testdata/workspace/Cargo.toml
diff --git a/testdata/tree/workspace/README.md → testdata/workspace/README.md b/testdata/tree/workspace/README.md → testdata/workspace/README.md
diff --git a/testdata/tree/workspace/main/Cargo.toml → testdata/workspace/main/Cargo.toml b/testdata/tree/workspace/main/Cargo.toml → testdata/workspace/main/Cargo.toml
diff --git a/testdata/tree/workspace/main/src/main.rs → testdata/workspace/main/src/main.rs b/testdata/tree/workspace/main/src/main.rs → testdata/workspace/main/src/main.rs
diff --git a/testdata/tree/workspace/main2/Cargo.toml → testdata/workspace/main2/Cargo.toml b/testdata/tree/workspace/main2/Cargo.toml → testdata/workspace/main2/Cargo.toml
diff --git a/testdata/tree/workspace/main2/src/main.rs → testdata/workspace/main2/src/main.rs b/testdata/tree/workspace/main2/src/main.rs → testdata/workspace/main2/src/main.rs
diff --git a/testdata/tree/workspace/utils/Cargo.toml → testdata/workspace/utils/Cargo.toml b/testdata/tree/workspace/utils/Cargo.toml → testdata/workspace/utils/Cargo.toml
diff --git a/testdata/tree/workspace/utils/src/lib.rs → testdata/workspace/utils/src/lib.rs b/testdata/tree/workspace/utils/src/lib.rs → testdata/workspace/utils/src/lib.rs
diff --git a/tests/cli/in_diff.rs b/tests/cli/in_diff.rs
@@ -23,8 +23,8 @@ fn diff_trees_well_tested() {
 
 #[test]
 fn list_mutants_changed_in_diff1() {
-    let src0 = read_to_string("testdata/tree/diff0/src/lib.rs").unwrap();
-    let src1 = read_to_string("testdata/tree/diff1/src/lib.rs").unwrap();
+    let src0 = read_to_string("testdata/diff0/src/lib.rs").unwrap();
+    let src1 = read_to_string("testdata/diff1/src/lib.rs").unwrap();
     let diff = TextDiff::from_lines(&src0, &src1)
         .unified_diff()
         .context_radius(2)
@@ -70,8 +70,8 @@ fn list_mutants_changed_in_diff1() {
 /// If the text in the diff doesn't look like the tree then error out.
 #[test]
 fn mismatched_diff_causes_error() {
-    let src0 = read_to_string("testdata/tree/diff0/src/lib.rs").unwrap();
-    let src1 = read_to_string("testdata/tree/diff1/src/lib.rs").unwrap();
+    let src0 = read_to_string("testdata/diff0/src/lib.rs").unwrap();
+    let src1 = read_to_string("testdata/diff1/src/lib.rs").unwrap();
     let diff = TextDiff::from_lines(&src0, &src1)
         .unified_diff()
         .context_radius(2)