diff --git a/Cargo.lock b/Cargo.lock index 90a9f38220..cf4de8bbea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,20 +205,6 @@ dependencies = [ "cc", ] -[[package]] -name = "console" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "terminal_size", - "termios", - "winapi 0.3.9", -] - [[package]] name = "crc32fast" version = "1.2.0" @@ -298,12 +284,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f" -[[package]] -name = "dtoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" - [[package]] name = "either" version = "1.5.3" @@ -319,12 +299,6 @@ dependencies = [ "log", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "env_logger" version = "0.7.1" @@ -537,20 +511,6 @@ dependencies = [ "libc", ] -[[package]] -name = "insta" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617e921abc813f96a3b00958c079e7bf1e2db998f8a04f1546dd967373a418ee" -dependencies = [ - "console", - "difference", - "lazy_static", - "serde", - "serde_json", - "serde_yaml", -] - [[package]] name = "instant" version = "0.1.6" @@ -665,12 +625,6 @@ dependencies = [ "cmake", ] -[[package]] -name = "linked-hash-map" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" - [[package]] name = "lock_api" version = "0.4.1" @@ -1128,7 +1082,6 @@ dependencies = [ "chalk-solve", "ena", "expect", - "insta", "itertools", "log", "ra_arena", @@ -1659,18 +1612,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_yaml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -dependencies = [ - "dtoa", - "linked-hash-map", - "serde", - "yaml-rust", -] - [[package]] name = "sharded-slab" version = "0.0.9" @@ -1757,25 +1698,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "termios" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" -dependencies = [ - "libc", -] - [[package]] name = "test_utils" version = "0.1.0" @@ -2065,12 +1987,3 @@ dependencies = [ "quote", "walkdir", ] - -[[package]] -name = "yaml-rust" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -dependencies = [ - "linked-hash-map", -] diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 548a3fc1f4..cdabb359f2 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml @@ -33,7 +33,6 @@ chalk-ir = { version = "0.18.0" } chalk-recursive = { version = "0.18.0" } [dev-dependencies] -insta = "0.16.0" expect = { path = "../expect" } tracing = "0.1" diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs index 59a21092ec..45bc14c37f 100644 --- a/crates/ra_hir_ty/src/tests.rs +++ b/crates/ra_hir_ty/src/tests.rs @@ -34,8 +34,8 @@ use crate::{ }; // These tests compare the inference results for all expressions in a file -// against snapshots of the expected results using insta. Use cargo-insta to -// update the snapshots. +// against snapshots of the expected results using expect. Use +// `env UPDATE_EXPECT=1 cargo test -p ra_hir_ty` to update the snapshots. fn setup_tracing() -> tracing::subscriber::DefaultGuard { use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md index cee916c096..d0c6eea61f 100644 --- a/docs/dev/architecture.md +++ b/docs/dev/architecture.md @@ -170,8 +170,7 @@ The innermost and most elaborate boundary is `hir`. It has a much richer vocabulary of types than `ide`, but the basic testing setup is the same: we create a database, run some queries, assert result. -For comparisons, we use [insta](https://github.com/mitsuhiko/insta/) library for -snapshot testing. +For comparisons, we use the `expect` crate for snapshot testing. To test various analysis corner cases and avoid forgetting about old tests, we use so-called marks. See the `marks` module in the `test_utils` crate for more.