aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock87
-rw-r--r--crates/ra_hir_ty/Cargo.toml1
-rw-r--r--crates/ra_hir_ty/src/tests.rs4
-rw-r--r--docs/dev/architecture.md3
4 files changed, 3 insertions, 92 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 90a9f3822..cf4de8bbe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -206,20 +206,6 @@ dependencies = [
206] 206]
207 207
208[[package]] 208[[package]]
209name = "console"
210version = "0.11.3"
211source = "registry+https://github.com/rust-lang/crates.io-index"
212checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a"
213dependencies = [
214 "encode_unicode",
215 "lazy_static",
216 "libc",
217 "terminal_size",
218 "termios",
219 "winapi 0.3.9",
220]
221
222[[package]]
223name = "crc32fast" 209name = "crc32fast"
224version = "1.2.0" 210version = "1.2.0"
225source = "registry+https://github.com/rust-lang/crates.io-index" 211source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -299,12 +285,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
299checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f" 285checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f"
300 286
301[[package]] 287[[package]]
302name = "dtoa"
303version = "0.4.6"
304source = "registry+https://github.com/rust-lang/crates.io-index"
305checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
306
307[[package]]
308name = "either" 288name = "either"
309version = "1.5.3" 289version = "1.5.3"
310source = "registry+https://github.com/rust-lang/crates.io-index" 290source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -320,12 +300,6 @@ dependencies = [
320] 300]
321 301
322[[package]] 302[[package]]
323name = "encode_unicode"
324version = "0.3.6"
325source = "registry+https://github.com/rust-lang/crates.io-index"
326checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
327
328[[package]]
329name = "env_logger" 303name = "env_logger"
330version = "0.7.1" 304version = "0.7.1"
331source = "registry+https://github.com/rust-lang/crates.io-index" 305source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -538,20 +512,6 @@ dependencies = [
538] 512]
539 513
540[[package]] 514[[package]]
541name = "insta"
542version = "0.16.1"
543source = "registry+https://github.com/rust-lang/crates.io-index"
544checksum = "617e921abc813f96a3b00958c079e7bf1e2db998f8a04f1546dd967373a418ee"
545dependencies = [
546 "console",
547 "difference",
548 "lazy_static",
549 "serde",
550 "serde_json",
551 "serde_yaml",
552]
553
554[[package]]
555name = "instant" 515name = "instant"
556version = "0.1.6" 516version = "0.1.6"
557source = "registry+https://github.com/rust-lang/crates.io-index" 517source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -666,12 +626,6 @@ dependencies = [
666] 626]
667 627
668[[package]] 628[[package]]
669name = "linked-hash-map"
670version = "0.5.3"
671source = "registry+https://github.com/rust-lang/crates.io-index"
672checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
673
674[[package]]
675name = "lock_api" 629name = "lock_api"
676version = "0.4.1" 630version = "0.4.1"
677source = "registry+https://github.com/rust-lang/crates.io-index" 631source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1128,7 +1082,6 @@ dependencies = [
1128 "chalk-solve", 1082 "chalk-solve",
1129 "ena", 1083 "ena",
1130 "expect", 1084 "expect",
1131 "insta",
1132 "itertools", 1085 "itertools",
1133 "log", 1086 "log",
1134 "ra_arena", 1087 "ra_arena",
@@ -1660,18 +1613,6 @@ dependencies = [
1660] 1613]
1661 1614
1662[[package]] 1615[[package]]
1663name = "serde_yaml"
1664version = "0.8.13"
1665source = "registry+https://github.com/rust-lang/crates.io-index"
1666checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
1667dependencies = [
1668 "dtoa",
1669 "linked-hash-map",
1670 "serde",
1671 "yaml-rust",
1672]
1673
1674[[package]]
1675name = "sharded-slab" 1616name = "sharded-slab"
1676version = "0.0.9" 1617version = "0.0.9"
1677source = "registry+https://github.com/rust-lang/crates.io-index" 1618source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1758,25 +1699,6 @@ dependencies = [
1758] 1699]
1759 1700
1760[[package]] 1701[[package]]
1761name = "terminal_size"
1762version = "0.1.13"
1763source = "registry+https://github.com/rust-lang/crates.io-index"
1764checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13"
1765dependencies = [
1766 "libc",
1767 "winapi 0.3.9",
1768]
1769
1770[[package]]
1771name = "termios"
1772version = "0.3.2"
1773source = "registry+https://github.com/rust-lang/crates.io-index"
1774checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2"
1775dependencies = [
1776 "libc",
1777]
1778
1779[[package]]
1780name = "test_utils" 1702name = "test_utils"
1781version = "0.1.0" 1703version = "0.1.0"
1782dependencies = [ 1704dependencies = [
@@ -2065,12 +1987,3 @@ dependencies = [
2065 "quote", 1987 "quote",
2066 "walkdir", 1988 "walkdir",
2067] 1989]
2068
2069[[package]]
2070name = "yaml-rust"
2071version = "0.4.4"
2072source = "registry+https://github.com/rust-lang/crates.io-index"
2073checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
2074dependencies = [
2075 "linked-hash-map",
2076]
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 548a3fc1f..cdabb359f 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" }
33chalk-recursive = { version = "0.18.0" } 33chalk-recursive = { version = "0.18.0" }
34 34
35[dev-dependencies] 35[dev-dependencies]
36insta = "0.16.0"
37expect = { path = "../expect" } 36expect = { path = "../expect" }
38 37
39tracing = "0.1" 38tracing = "0.1"
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 59a21092e..45bc14c37 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -34,8 +34,8 @@ use crate::{
34}; 34};
35 35
36// These tests compare the inference results for all expressions in a file 36// These tests compare the inference results for all expressions in a file
37// against snapshots of the expected results using insta. Use cargo-insta to 37// against snapshots of the expected results using expect. Use
38// update the snapshots. 38// `env UPDATE_EXPECT=1 cargo test -p ra_hir_ty` to update the snapshots.
39 39
40fn setup_tracing() -> tracing::subscriber::DefaultGuard { 40fn setup_tracing() -> tracing::subscriber::DefaultGuard {
41 use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; 41 use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index cee916c09..d0c6eea61 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
170vocabulary of types than `ide`, but the basic testing setup is the same: we 170vocabulary of types than `ide`, but the basic testing setup is the same: we
171create a database, run some queries, assert result. 171create a database, run some queries, assert result.
172 172
173For comparisons, we use [insta](https://github.com/mitsuhiko/insta/) library for 173For comparisons, we use the `expect` crate for snapshot testing.
174snapshot testing.
175 174
176To test various analysis corner cases and avoid forgetting about old tests, we 175To test various analysis corner cases and avoid forgetting about old tests, we
177use so-called marks. See the `marks` module in the `test_utils` crate for more. 176use so-called marks. See the `marks` module in the `test_utils` crate for more.