diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dd4c3608..8f2a1c59 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,4 +36,4 @@ jobs: with: toolchain: 1.51.0 - name: Check - run: cargo check --no-default-features + run: cargo check -p insta --no-default-features diff --git a/.gitignore b/.gitignore index d75dfc25..9656d14a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ target **/*.rs.bk -/Cargo.lock .vscode/*.log diff --git a/cargo-insta/Cargo.lock b/Cargo.lock similarity index 81% rename from cargo-insta/Cargo.lock rename to Cargo.lock index 3422c5a4..7774c40c 100644 --- a/cargo-insta/Cargo.lock +++ b/Cargo.lock @@ -11,6 +11,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "bitflags" version = "1.3.2" @@ -32,7 +44,10 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ + "lazy_static", "memchr", + "regex-automata", + "serde", ] [[package]] @@ -129,6 +144,64 @@ dependencies = [ "libc", ] +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.11" @@ -149,6 +222,28 @@ dependencies = [ "typenum", ] +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + [[package]] name = "digest" version = "0.10.5" @@ -159,6 +254,23 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dircpy" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8466f8d28ca6da4c9dfbbef6ad4bff6f2fdd5e412d821025b0d3f0a9d74a8c1e" +dependencies = [ + "jwalk", + "log", + "walkdir", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + [[package]] name = "encode_unicode" version = "0.3.6" @@ -273,12 +385,19 @@ name = "insta" version = "1.33.0" dependencies = [ "console", + "csv", + "globset", "lazy_static", "linked-hash-map", "pest", "pest_derive", + "regex", + "ron", "serde", "similar", + "similar-asserts", + "toml", + "walkdir", "yaml-rust", ] @@ -291,6 +410,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "integration-tests" +version = "0.1.0" +dependencies = [ + "dircpy", + "insta", + "serde", + "walkdir", +] + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -302,12 +431,28 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + [[package]] name = "itoa" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +[[package]] +name = "jwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" +dependencies = [ + "crossbeam", + "rayon", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -347,6 +492,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "once_cell" version = "1.14.0" @@ -439,6 +593,26 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -459,12 +633,29 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + [[package]] name = "regex-syntax" version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64", + "bitflags", + "serde", +] + [[package]] name = "rustix" version = "0.37.19" @@ -494,6 +685,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "semver" version = "1.0.19" @@ -529,7 +726,7 @@ version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ - "itoa", + "itoa 1.0.3", "ryu", "serde", ] @@ -550,6 +747,20 @@ name = "similar" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" +dependencies = [ + "bstr", + "unicode-segmentation", +] + +[[package]] +name = "similar-asserts" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +dependencies = [ + "console", + "similar", +] [[package]] name = "structopt" @@ -637,6 +848,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/Cargo.toml b/Cargo.toml index 70fec999..4e49c2d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,67 +1,4 @@ -[package] -name = "insta" -version = "1.33.0" -license = "Apache-2.0" -authors = ["Armin Ronacher "] -description = "A snapshot testing library for Rust" -edition = "2018" -rust-version = "1.51.0" -homepage = "https://insta.rs/" -repository = "https://github.com/mitsuhiko/insta" -keywords = ["snapshot", "testing", "jest", "approval"] -readme = "README.md" -exclude = [ - "assets/*" -] +[workspace] +members = ["cargo-insta", "insta", "cargo-insta/integration-tests"] -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[features] -default = ["colors"] - -# when the redactions feature is enabled values can be redacted in serialized -# snapshots. -redactions = ["pest", "pest_derive", "serde"] - -# Enables support for running filters on snapshot -filters = ["regex"] - -# Glob support -glob = ["walkdir", "globset"] - -# Color support -colors = ["console"] - -# Serialization formats -# TODO: This could be cleaner by using "dep:csv" without renaming the dep, but -# this technique allows for a lower MSRV -csv = ["dep_csv", "serde"] -json = ["serde"] -ron = ["dep_ron", "serde"] -toml = ["dep_toml", "serde"] -yaml = ["serde"] - -# internal feature exclusive to cargo-insta -_cargo_insta_internal = [] - -[dependencies] -dep_csv = { package = "csv", version = "=1.1.6", optional = true } -console = { version = "0.15.4", optional = true, default-features = false } -pest = { version = "2.1.3", optional = true } -pest_derive = { version = "2.1.0", optional = true } -dep_ron = { package = "ron", version = "0.7.1", optional = true } -dep_toml = { package = "toml", version = "0.5.7", optional = true } -globset = { version = "0.4.6", optional = true } -walkdir = { version = "2.3.1", optional = true } -similar = { version = "2.1.0", features = ["inline"] } -regex = { version = "1.6.0", default-features = false, optional = true, features = ["std", "unicode"] } -yaml-rust = "0.4.5" -serde = { version = "1.0.117", optional = true } -linked-hash-map = "0.5.6" -lazy_static = "1.4.0" - -[dev-dependencies] -serde = { version = "1.0.117", features = ["derive"] } -similar-asserts = "1.4.2" +resolver = "2" diff --git a/Makefile b/Makefile index b73d1353..e2aa03c4 100644 --- a/Makefile +++ b/Makefile @@ -21,14 +21,13 @@ cargotest: @cargo test --all-features @cargo test --no-default-features @cargo test --features redactions -- --test-threads 1 - @cd cargo-insta; cargo test check-minver: @echo "MINVER CHECK" - @cargo minimal-versions check - @cargo minimal-versions check --all-features - @cargo minimal-versions check --no-default-features - @cargo minimal-versions check --features redactions + @cargo minimal-versions check -p insta + @cargo minimal-versions check -p insta --all-features + @cargo minimal-versions check -p insta --no-default-features + @cargo minimal-versions check -p insta --features redactions format: @rustup component add rustfmt 2> /dev/null diff --git a/cargo-insta/Cargo.toml b/cargo-insta/Cargo.toml index 3eff7ae4..938ecfd0 100644 --- a/cargo-insta/Cargo.toml +++ b/cargo-insta/Cargo.toml @@ -12,7 +12,12 @@ edition = "2018" readme = "README.md" [dependencies] -insta = { version = "=1.33.0", path = "..", features = ["json", "yaml", "redactions", "_cargo_insta_internal"] } +insta = { version = "=1.33.0", path = "../insta", features = [ + "json", + "yaml", + "redactions", + "_cargo_insta_internal", +] } cargo_metadata = { version = "0.18.0", default-features = false } console = "0.15.4" structopt = { version = "0.3.26", default-features = false } diff --git a/cargo-insta/integration-tests/Cargo.toml b/cargo-insta/integration-tests/Cargo.toml index 1163e476..79f5988b 100644 --- a/cargo-insta/integration-tests/Cargo.toml +++ b/cargo-insta/integration-tests/Cargo.toml @@ -8,6 +8,11 @@ edition = "2018" [dependencies] dircpy = "0.3.4" -insta = { path = "../..", features = ["json", "yaml", "redactions", "glob"] } +insta = { path = "../../insta", features = [ + "json", + "yaml", + "redactions", + "glob", +] } walkdir = "2.3.1" serde = { version = "1.0.117", features = ["derive"] } diff --git a/cargo-insta/integration-tests/src/main.rs b/cargo-insta/integration-tests/src/main.rs index ce27bea0..05ec7863 100644 --- a/cargo-insta/integration-tests/src/main.rs +++ b/cargo-insta/integration-tests/src/main.rs @@ -30,7 +30,7 @@ fn main() { .unwrap(); // run tests and accept snapshots - Command::new("../target/debug/cargo-insta") + Command::new("../../target/debug/cargo-insta") .arg("test") .arg("--accept") .arg("--no-ignore") diff --git a/cargo-insta/src/cli.rs b/cargo-insta/src/cli.rs index 444729c6..936fd546 100644 --- a/cargo-insta/src/cli.rs +++ b/cargo-insta/src/cli.rs @@ -45,6 +45,7 @@ struct Opts { bin_name = "cargo insta", after_help = "For the online documentation of the latest version, see https://insta.rs/docs/cli/." )] +#[allow(clippy::large_enum_variant)] enum Command { /// Interactively review snapshots #[structopt(name = "review", alias = "verify")] @@ -415,6 +416,7 @@ fn handle_target_args(target_args: &TargetArgs) -> Result, Box< } } +#[allow(clippy::type_complexity)] fn load_snapshot_containers<'a>( loc: &'a LocationInfo, ) -> Result< @@ -775,6 +777,7 @@ fn handle_unreferenced_snapshots( Ok(()) } +#[allow(clippy::type_complexity)] fn prepare_test_runner<'snapshot_ref>( test_runner: TestRunner, unreferenced: UnreferencedSnapshots, diff --git a/cargo-insta/src/inline.rs b/cargo-insta/src/inline.rs index 1142e451..48c43f16 100644 --- a/cargo-insta/src/inline.rs +++ b/cargo-insta/src/inline.rs @@ -104,7 +104,7 @@ impl FilePatcher { // replace lines let snapshot_line_contents = - vec![prefix, snapshot.to_inline(inline.indentation), suffix].join(""); + [prefix, snapshot.to_inline(inline.indentation), suffix].join(""); self.lines.splice( inline.start.0..=inline.end.0, diff --git a/insta/Cargo.toml b/insta/Cargo.toml new file mode 100644 index 00000000..91ec1a57 --- /dev/null +++ b/insta/Cargo.toml @@ -0,0 +1,67 @@ +[package] +name = "insta" +version = "1.33.0" +license = "Apache-2.0" +authors = ["Armin Ronacher "] +description = "A snapshot testing library for Rust" +edition = "2018" +rust-version = "1.51.0" +homepage = "https://insta.rs/" +repository = "https://github.com/mitsuhiko/insta" +keywords = ["snapshot", "testing", "jest", "approval"] +readme = "README.md" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[features] +default = ["colors"] + +# when the redactions feature is enabled values can be redacted in serialized +# snapshots. +redactions = ["pest", "pest_derive", "serde"] + +# Enables support for running filters on snapshot +filters = ["regex"] + +# Glob support +glob = ["walkdir", "globset"] + +# Color support +colors = ["console"] + +# Serialization formats +# TODO: This could be cleaner by using "dep:csv" without renaming the dep, but +# this technique allows for a lower MSRV +csv = ["dep_csv", "serde"] +json = ["serde"] +ron = ["dep_ron", "serde"] +toml = ["dep_toml", "serde"] +yaml = ["serde"] + +# internal feature exclusive to cargo-insta +_cargo_insta_internal = [] + +[dependencies] +dep_csv = { package = "csv", version = "=1.1.6", optional = true } +console = { version = "0.15.4", optional = true, default-features = false } +pest = { version = "2.1.3", optional = true } +pest_derive = { version = "2.1.0", optional = true } +dep_ron = { package = "ron", version = "0.7.1", optional = true } +dep_toml = { package = "toml", version = "0.5.7", optional = true } +globset = { version = "0.4.6", optional = true } +walkdir = { version = "2.3.1", optional = true } +similar = { version = "2.1.0", features = ["inline"] } +regex = { version = "1.6.0", default-features = false, optional = true, features = [ + "std", + "unicode", +] } +yaml-rust = "0.4.5" +serde = { version = "1.0.117", optional = true } +linked-hash-map = "0.5.6" +lazy_static = "1.4.0" + +[dev-dependencies] +serde = { version = "1.0.117", features = ["derive"] } +similar-asserts = "1.4.2" diff --git a/src/content/json.rs b/insta/src/content/json.rs similarity index 100% rename from src/content/json.rs rename to insta/src/content/json.rs diff --git a/src/content/mod.rs b/insta/src/content/mod.rs similarity index 100% rename from src/content/mod.rs rename to insta/src/content/mod.rs diff --git a/src/content/serialization.rs b/insta/src/content/serialization.rs similarity index 100% rename from src/content/serialization.rs rename to insta/src/content/serialization.rs diff --git a/src/content/yaml.rs b/insta/src/content/yaml.rs similarity index 100% rename from src/content/yaml.rs rename to insta/src/content/yaml.rs diff --git a/src/env.rs b/insta/src/env.rs similarity index 100% rename from src/env.rs rename to insta/src/env.rs diff --git a/src/filters.rs b/insta/src/filters.rs similarity index 100% rename from src/filters.rs rename to insta/src/filters.rs diff --git a/src/glob.rs b/insta/src/glob.rs similarity index 100% rename from src/glob.rs rename to insta/src/glob.rs diff --git a/src/lib.rs b/insta/src/lib.rs similarity index 100% rename from src/lib.rs rename to insta/src/lib.rs diff --git a/src/macros.rs b/insta/src/macros.rs similarity index 100% rename from src/macros.rs rename to insta/src/macros.rs diff --git a/src/output.rs b/insta/src/output.rs similarity index 100% rename from src/output.rs rename to insta/src/output.rs diff --git a/src/redaction.rs b/insta/src/redaction.rs similarity index 100% rename from src/redaction.rs rename to insta/src/redaction.rs diff --git a/src/runtime.rs b/insta/src/runtime.rs similarity index 100% rename from src/runtime.rs rename to insta/src/runtime.rs diff --git a/src/select_grammar.pest b/insta/src/select_grammar.pest similarity index 100% rename from src/select_grammar.pest rename to insta/src/select_grammar.pest diff --git a/src/serialization.rs b/insta/src/serialization.rs similarity index 100% rename from src/serialization.rs rename to insta/src/serialization.rs diff --git a/src/settings.rs b/insta/src/settings.rs similarity index 100% rename from src/settings.rs rename to insta/src/settings.rs diff --git a/src/snapshot.rs b/insta/src/snapshot.rs similarity index 100% rename from src/snapshot.rs rename to insta/src/snapshot.rs diff --git a/src/snapshots/doctest_runtime_rs__named.snap b/insta/src/snapshots/doctest_runtime_rs__named.snap similarity index 100% rename from src/snapshots/doctest_runtime_rs__named.snap rename to insta/src/snapshots/doctest_runtime_rs__named.snap diff --git a/src/snapshots/insta__test__embedded.snap b/insta/src/snapshots/insta__test__embedded.snap similarity index 100% rename from src/snapshots/insta__test__embedded.snap rename to insta/src/snapshots/insta__test__embedded.snap diff --git a/src/test.rs b/insta/src/test.rs similarity index 100% rename from src/test.rs rename to insta/src/test.rs diff --git a/src/utils.rs b/insta/src/utils.rs similarity index 100% rename from src/utils.rs rename to insta/src/utils.rs diff --git a/tests/glob_submodule/mod.rs b/insta/tests/glob_submodule/mod.rs similarity index 100% rename from tests/glob_submodule/mod.rs rename to insta/tests/glob_submodule/mod.rs diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap b/insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap similarity index 100% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap rename to insta/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap diff --git a/tests/inputs-nested/a/file.txt b/insta/tests/inputs-nested/a/file.txt similarity index 100% rename from tests/inputs-nested/a/file.txt rename to insta/tests/inputs-nested/a/file.txt diff --git a/tests/inputs-nested/b/file.txt b/insta/tests/inputs-nested/b/file.txt similarity index 100% rename from tests/inputs-nested/b/file.txt rename to insta/tests/inputs-nested/b/file.txt diff --git a/tests/inputs/goodbye.txt b/insta/tests/inputs/goodbye.txt similarity index 100% rename from tests/inputs/goodbye.txt rename to insta/tests/inputs/goodbye.txt diff --git a/tests/inputs/hello.txt b/insta/tests/inputs/hello.txt similarity index 100% rename from tests/inputs/hello.txt rename to insta/tests/inputs/hello.txt diff --git a/tests/link-to-inputs b/insta/tests/link-to-inputs similarity index 100% rename from tests/link-to-inputs rename to insta/tests/link-to-inputs diff --git a/tests/snapshots/snapshot_no_module_prepending.snap b/insta/tests/snapshots/snapshot_no_module_prepending.snap similarity index 100% rename from tests/snapshots/snapshot_no_module_prepending.snap rename to insta/tests/snapshots/snapshot_no_module_prepending.snap diff --git a/tests/snapshots/test_basic__debug_vector.snap b/insta/tests/snapshots/test_basic__debug_vector.snap similarity index 100% rename from tests/snapshots/test_basic__debug_vector.snap rename to insta/tests/snapshots/test_basic__debug_vector.snap diff --git a/tests/snapshots/test_basic__display.snap b/insta/tests/snapshots/test_basic__display.snap similarity index 100% rename from tests/snapshots/test_basic__display.snap rename to insta/tests/snapshots/test_basic__display.snap diff --git a/tests/snapshots/test_basic__insta_sort_order.snap b/insta/tests/snapshots/test_basic__insta_sort_order.snap similarity index 100% rename from tests/snapshots/test_basic__insta_sort_order.snap rename to insta/tests/snapshots/test_basic__insta_sort_order.snap diff --git a/tests/snapshots/test_basic__json_vector.snap b/insta/tests/snapshots/test_basic__json_vector.snap similarity index 100% rename from tests/snapshots/test_basic__json_vector.snap rename to insta/tests/snapshots/test_basic__json_vector.snap diff --git a/tests/snapshots/test_basic__nested__nested_module.snap b/insta/tests/snapshots/test_basic__nested__nested_module.snap similarity index 100% rename from tests/snapshots/test_basic__nested__nested_module.snap rename to insta/tests/snapshots/test_basic__nested__nested_module.snap diff --git a/tests/snapshots/test_basic__unnamed_debug_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector-2.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_debug_vector-2.snap rename to insta/tests/snapshots/test_basic__unnamed_debug_vector-2.snap diff --git a/tests/snapshots/test_basic__unnamed_debug_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector-3.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_debug_vector-3.snap rename to insta/tests/snapshots/test_basic__unnamed_debug_vector-3.snap diff --git a/tests/snapshots/test_basic__unnamed_debug_vector.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_debug_vector.snap rename to insta/tests/snapshots/test_basic__unnamed_debug_vector.snap diff --git a/tests/snapshots/test_basic__unnamed_display-2.snap b/insta/tests/snapshots/test_basic__unnamed_display-2.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_display-2.snap rename to insta/tests/snapshots/test_basic__unnamed_display-2.snap diff --git a/tests/snapshots/test_basic__unnamed_display.snap b/insta/tests/snapshots/test_basic__unnamed_display.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_display.snap rename to insta/tests/snapshots/test_basic__unnamed_display.snap diff --git a/tests/snapshots/test_basic__unnamed_json_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector-2.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_json_vector-2.snap rename to insta/tests/snapshots/test_basic__unnamed_json_vector-2.snap diff --git a/tests/snapshots/test_basic__unnamed_json_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector-3.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_json_vector-3.snap rename to insta/tests/snapshots/test_basic__unnamed_json_vector-3.snap diff --git a/tests/snapshots/test_basic__unnamed_json_vector.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_json_vector.snap rename to insta/tests/snapshots/test_basic__unnamed_json_vector.snap diff --git a/tests/snapshots/test_basic__unnamed_nested_closure.snap b/insta/tests/snapshots/test_basic__unnamed_nested_closure.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_nested_closure.snap rename to insta/tests/snapshots/test_basic__unnamed_nested_closure.snap diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_yaml_vector-2.snap rename to insta/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_yaml_vector-3.snap rename to insta/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector.snap similarity index 100% rename from tests/snapshots/test_basic__unnamed_yaml_vector.snap rename to insta/tests/snapshots/test_basic__unnamed_yaml_vector.snap diff --git a/tests/snapshots/test_basic__yaml_vector.snap b/insta/tests/snapshots/test_basic__yaml_vector.snap similarity index 100% rename from tests/snapshots/test_basic__yaml_vector.snap rename to insta/tests/snapshots/test_basic__yaml_vector.snap diff --git a/tests/snapshots/test_bugs__crlf.snap b/insta/tests/snapshots/test_bugs__crlf.snap similarity index 100% rename from tests/snapshots/test_bugs__crlf.snap rename to insta/tests/snapshots/test_bugs__crlf.snap diff --git a/tests/snapshots/test_bugs__trailing_crlf.snap b/insta/tests/snapshots/test_bugs__trailing_crlf.snap similarity index 100% rename from tests/snapshots/test_bugs__trailing_crlf.snap rename to insta/tests/snapshots/test_bugs__trailing_crlf.snap diff --git a/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap b/insta/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap similarity index 100% rename from tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap rename to insta/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap diff --git a/tests/snapshots/test_glob__basic_globbing@hello.txt.snap b/insta/tests/snapshots/test_glob__basic_globbing@hello.txt.snap similarity index 100% rename from tests/snapshots/test_glob__basic_globbing@hello.txt.snap rename to insta/tests/snapshots/test_glob__basic_globbing@hello.txt.snap diff --git a/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap b/insta/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap similarity index 100% rename from tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap rename to insta/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap diff --git a/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap b/insta/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap similarity index 100% rename from tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap rename to insta/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap diff --git a/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap b/insta/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap similarity index 100% rename from tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap rename to insta/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap diff --git a/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap b/insta/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap similarity index 100% rename from tests/snapshots/test_glob__globs_follow_links@hello.txt.snap rename to insta/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap diff --git a/tests/snapshots/test_inline__unnamed_single_line-2.snap b/insta/tests/snapshots/test_inline__unnamed_single_line-2.snap similarity index 100% rename from tests/snapshots/test_inline__unnamed_single_line-2.snap rename to insta/tests/snapshots/test_inline__unnamed_single_line-2.snap diff --git a/tests/snapshots/test_inline__unnamed_single_line.snap b/insta/tests/snapshots/test_inline__unnamed_single_line.snap similarity index 100% rename from tests/snapshots/test_inline__unnamed_single_line.snap rename to insta/tests/snapshots/test_inline__unnamed_single_line.snap diff --git a/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap b/insta/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap similarity index 100% rename from tests/snapshots/test_inline__unnamed_thread_single_line-2.snap rename to insta/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap diff --git a/tests/snapshots/test_inline__unnamed_thread_single_line.snap b/insta/tests/snapshots/test_inline__unnamed_thread_single_line.snap similarity index 100% rename from tests/snapshots/test_inline__unnamed_thread_single_line.snap rename to insta/tests/snapshots/test_inline__unnamed_thread_single_line.snap diff --git a/tests/snapshots/test_redaction__foo_bar.snap b/insta/tests/snapshots/test_redaction__foo_bar.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar.snap rename to insta/tests/snapshots/test_redaction__foo_bar.snap diff --git a/tests/snapshots/test_redaction__foo_bar_alt.snap b/insta/tests/snapshots/test_redaction__foo_bar_alt.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_alt.snap rename to insta/tests/snapshots/test_redaction__foo_bar_alt.snap diff --git a/tests/snapshots/test_redaction__foo_bar_deep.snap b/insta/tests/snapshots/test_redaction__foo_bar_deep.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_deep.snap rename to insta/tests/snapshots/test_redaction__foo_bar_deep.snap diff --git a/tests/snapshots/test_redaction__foo_bar_full_range.snap b/insta/tests/snapshots/test_redaction__foo_bar_full_range.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_full_range.snap rename to insta/tests/snapshots/test_redaction__foo_bar_full_range.snap diff --git a/tests/snapshots/test_redaction__foo_bar_range.snap b/insta/tests/snapshots/test_redaction__foo_bar_range.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_range.snap rename to insta/tests/snapshots/test_redaction__foo_bar_range.snap diff --git a/tests/snapshots/test_redaction__foo_bar_range_from.snap b/insta/tests/snapshots/test_redaction__foo_bar_range_from.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_range_from.snap rename to insta/tests/snapshots/test_redaction__foo_bar_range_from.snap diff --git a/tests/snapshots/test_redaction__foo_bar_range_to.snap b/insta/tests/snapshots/test_redaction__foo_bar_range_to.snap similarity index 100% rename from tests/snapshots/test_redaction__foo_bar_range_to.snap rename to insta/tests/snapshots/test_redaction__foo_bar_range_to.snap diff --git a/tests/snapshots/test_redaction__map_key_redaction.snap b/insta/tests/snapshots/test_redaction__map_key_redaction.snap similarity index 100% rename from tests/snapshots/test_redaction__map_key_redaction.snap rename to insta/tests/snapshots/test_redaction__map_key_redaction.snap diff --git a/tests/snapshots/test_redaction__rounded_redaction.snap b/insta/tests/snapshots/test_redaction__rounded_redaction.snap similarity index 100% rename from tests/snapshots/test_redaction__rounded_redaction.snap rename to insta/tests/snapshots/test_redaction__rounded_redaction.snap diff --git a/tests/snapshots/test_redaction__struct_array_redaction.snap b/insta/tests/snapshots/test_redaction__struct_array_redaction.snap similarity index 100% rename from tests/snapshots/test_redaction__struct_array_redaction.snap rename to insta/tests/snapshots/test_redaction__struct_array_redaction.snap diff --git a/tests/snapshots/test_redaction__user.snap b/insta/tests/snapshots/test_redaction__user.snap similarity index 100% rename from tests/snapshots/test_redaction__user.snap rename to insta/tests/snapshots/test_redaction__user.snap diff --git a/tests/snapshots/test_redaction__user_csv.snap b/insta/tests/snapshots/test_redaction__user_csv.snap similarity index 100% rename from tests/snapshots/test_redaction__user_csv.snap rename to insta/tests/snapshots/test_redaction__user_csv.snap diff --git a/tests/snapshots/test_redaction__user_json.snap b/insta/tests/snapshots/test_redaction__user_json.snap similarity index 100% rename from tests/snapshots/test_redaction__user_json.snap rename to insta/tests/snapshots/test_redaction__user_json.snap diff --git a/tests/snapshots/test_redaction__user_json_flags.snap b/insta/tests/snapshots/test_redaction__user_json_flags.snap similarity index 100% rename from tests/snapshots/test_redaction__user_json_flags.snap rename to insta/tests/snapshots/test_redaction__user_json_flags.snap diff --git a/tests/snapshots/test_redaction__user_json_flags_alt.snap b/insta/tests/snapshots/test_redaction__user_json_flags_alt.snap similarity index 100% rename from tests/snapshots/test_redaction__user_json_flags_alt.snap rename to insta/tests/snapshots/test_redaction__user_json_flags_alt.snap diff --git a/tests/snapshots/test_redaction__user_json_settings.snap b/insta/tests/snapshots/test_redaction__user_json_settings.snap similarity index 100% rename from tests/snapshots/test_redaction__user_json_settings.snap rename to insta/tests/snapshots/test_redaction__user_json_settings.snap diff --git a/tests/snapshots/test_redaction__user_json_settings_callback.snap b/insta/tests/snapshots/test_redaction__user_json_settings_callback.snap similarity index 100% rename from tests/snapshots/test_redaction__user_json_settings_callback.snap rename to insta/tests/snapshots/test_redaction__user_json_settings_callback.snap diff --git a/tests/snapshots/test_redaction__user_ron.snap b/insta/tests/snapshots/test_redaction__user_ron.snap similarity index 100% rename from tests/snapshots/test_redaction__user_ron.snap rename to insta/tests/snapshots/test_redaction__user_ron.snap diff --git a/tests/snapshots/test_redaction__user_toml.snap b/insta/tests/snapshots/test_redaction__user_toml.snap similarity index 100% rename from tests/snapshots/test_redaction__user_toml.snap rename to insta/tests/snapshots/test_redaction__user_toml.snap diff --git a/tests/snapshots/test_redaction__with_random_value_json_settings2.snap b/insta/tests/snapshots/test_redaction__with_random_value_json_settings2.snap similarity index 100% rename from tests/snapshots/test_redaction__with_random_value_json_settings2.snap rename to insta/tests/snapshots/test_redaction__with_random_value_json_settings2.snap diff --git a/tests/snapshots/test_settings__snapshot_with_description.snap b/insta/tests/snapshots/test_settings__snapshot_with_description.snap similarity index 100% rename from tests/snapshots/test_settings__snapshot_with_description.snap rename to insta/tests/snapshots/test_settings__snapshot_with_description.snap diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_info.snap b/insta/tests/snapshots/test_settings__snapshot_with_description_and_info.snap similarity index 100% rename from tests/snapshots/test_settings__snapshot_with_description_and_info.snap rename to insta/tests/snapshots/test_settings__snapshot_with_description_and_info.snap diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap b/insta/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap similarity index 100% rename from tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap rename to insta/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap diff --git a/tests/snapshots/test_suffixes__basic_suffixes@1.snap b/insta/tests/snapshots/test_suffixes__basic_suffixes@1.snap similarity index 100% rename from tests/snapshots/test_suffixes__basic_suffixes@1.snap rename to insta/tests/snapshots/test_suffixes__basic_suffixes@1.snap diff --git a/tests/snapshots/test_suffixes__basic_suffixes@2.snap b/insta/tests/snapshots/test_suffixes__basic_suffixes@2.snap similarity index 100% rename from tests/snapshots/test_suffixes__basic_suffixes@2.snap rename to insta/tests/snapshots/test_suffixes__basic_suffixes@2.snap diff --git a/tests/snapshots/test_suffixes__basic_suffixes@3.snap b/insta/tests/snapshots/test_suffixes__basic_suffixes@3.snap similarity index 100% rename from tests/snapshots/test_suffixes__basic_suffixes@3.snap rename to insta/tests/snapshots/test_suffixes__basic_suffixes@3.snap diff --git a/tests/snapshots2/test_settings__snapshot_path.snap b/insta/tests/snapshots2/test_settings__snapshot_path.snap similarity index 100% rename from tests/snapshots2/test_settings__snapshot_path.snap rename to insta/tests/snapshots2/test_settings__snapshot_path.snap diff --git a/tests/test_allow_duplicates.rs b/insta/tests/test_allow_duplicates.rs similarity index 100% rename from tests/test_allow_duplicates.rs rename to insta/tests/test_allow_duplicates.rs diff --git a/tests/test_basic.rs b/insta/tests/test_basic.rs similarity index 100% rename from tests/test_basic.rs rename to insta/tests/test_basic.rs diff --git a/tests/test_bugs.rs b/insta/tests/test_bugs.rs similarity index 100% rename from tests/test_bugs.rs rename to insta/tests/test_bugs.rs diff --git a/tests/test_clash_detection.rs b/insta/tests/test_clash_detection.rs similarity index 100% rename from tests/test_clash_detection.rs rename to insta/tests/test_clash_detection.rs diff --git a/tests/test_filters.rs b/insta/tests/test_filters.rs similarity index 100% rename from tests/test_filters.rs rename to insta/tests/test_filters.rs diff --git a/tests/test_glob.rs b/insta/tests/test_glob.rs similarity index 100% rename from tests/test_glob.rs rename to insta/tests/test_glob.rs diff --git a/tests/test_inline.rs b/insta/tests/test_inline.rs similarity index 100% rename from tests/test_inline.rs rename to insta/tests/test_inline.rs diff --git a/tests/test_redaction.rs b/insta/tests/test_redaction.rs similarity index 100% rename from tests/test_redaction.rs rename to insta/tests/test_redaction.rs diff --git a/tests/test_settings.rs b/insta/tests/test_settings.rs similarity index 100% rename from tests/test_settings.rs rename to insta/tests/test_settings.rs diff --git a/tests/test_suffixes.rs b/insta/tests/test_suffixes.rs similarity index 100% rename from tests/test_suffixes.rs rename to insta/tests/test_suffixes.rs diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 45317f41..592c85cf 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -1,14 +1,14 @@ #!/bin/bash set -euo pipefail -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd $SCRIPT_DIR/.. NEW_VERSION="${1}" echo "Bumping version: ${NEW_VERSION}" -perl -pi -e "s/^version = \".*?\"/version = \"$NEW_VERSION\"/" Cargo.toml +perl -pi -e "s/^version = \".*?\"/version = \"$NEW_VERSION\"/" insta/Cargo.toml perl -pi -e "s/^version = \".*?\"/version = \"$NEW_VERSION\"/" cargo-insta/Cargo.toml perl -pi -e "s/^(insta.*?)version = \".*?\"/\$1version = \"=$NEW_VERSION\"/" cargo-insta/Cargo.toml -cd cargo-insta; cargo check +cargo check diff --git a/scripts/publish-all.sh b/scripts/publish-all.sh index 6a49bb18..faf37545 100755 --- a/scripts/publish-all.sh +++ b/scripts/publish-all.sh @@ -1,8 +1,8 @@ #!/bin/bash set -euo pipefail -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd $SCRIPT_DIR/.. cargo publish -p insta -cd cargo-insta && cargo publish +cargo publish -p insta-insta