From b0fd3faf36c94c3fc52151c6aa82b36b43b7cceb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Aug 2020 13:19:31 +0200 Subject: Switch to expect_test from crates.io --- crates/hir_ty/Cargo.toml | 3 +-- crates/hir_ty/src/tests.rs | 2 +- crates/hir_ty/src/tests/coercion.rs | 2 +- crates/hir_ty/src/tests/macros.rs | 2 +- crates/hir_ty/src/tests/method_resolution.rs | 2 +- crates/hir_ty/src/tests/never_type.rs | 2 +- crates/hir_ty/src/tests/patterns.rs | 2 +- crates/hir_ty/src/tests/regression.rs | 2 +- crates/hir_ty/src/tests/simple.rs | 2 +- crates/hir_ty/src/tests/traits.rs | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) (limited to 'crates/hir_ty') diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index a319b0ce8..06da0d0ec 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml @@ -30,8 +30,7 @@ syntax = { path = "../syntax" } test_utils = { path = "../test_utils" } [dev-dependencies] +expect-test = "0.1" tracing = "0.1" tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] } tracing-tree = { version = "0.1.4" } - -expect = { path = "../expect" } diff --git a/crates/hir_ty/src/tests.rs b/crates/hir_ty/src/tests.rs index 91c9d38c5..0445efc9e 100644 --- a/crates/hir_ty/src/tests.rs +++ b/crates/hir_ty/src/tests.rs @@ -11,7 +11,7 @@ mod display_source_code; use std::{env, sync::Arc}; use base_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt}; -use expect::Expect; +use expect_test::Expect; use hir_def::{ body::{BodySourceMap, SyntheticSyntax}, child_by_source::ChildBySource, diff --git a/crates/hir_ty/src/tests/coercion.rs b/crates/hir_ty/src/tests/coercion.rs index 17efd75cb..7bc6c79f3 100644 --- a/crates/hir_ty/src/tests/coercion.rs +++ b/crates/hir_ty/src/tests/coercion.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use test_utils::mark; use super::{check_infer, check_infer_with_mismatches}; diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs index d887c7a79..597a195d0 100644 --- a/crates/hir_ty/src/tests/macros.rs +++ b/crates/hir_ty/src/tests/macros.rs @@ -1,6 +1,6 @@ use std::fs; -use expect::expect; +use expect_test::expect; use test_utils::project_dir; use super::{check_infer, check_types}; diff --git a/crates/hir_ty/src/tests/method_resolution.rs b/crates/hir_ty/src/tests/method_resolution.rs index fa68355aa..23b2601e6 100644 --- a/crates/hir_ty/src/tests/method_resolution.rs +++ b/crates/hir_ty/src/tests/method_resolution.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use super::{check_infer, check_types}; diff --git a/crates/hir_ty/src/tests/never_type.rs b/crates/hir_ty/src/tests/never_type.rs index 49538b572..335c474df 100644 --- a/crates/hir_ty/src/tests/never_type.rs +++ b/crates/hir_ty/src/tests/never_type.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use super::{check_infer_with_mismatches, check_types}; diff --git a/crates/hir_ty/src/tests/patterns.rs b/crates/hir_ty/src/tests/patterns.rs index 39fabf7eb..aeb191c79 100644 --- a/crates/hir_ty/src/tests/patterns.rs +++ b/crates/hir_ty/src/tests/patterns.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use test_utils::mark; use super::{check_infer, check_infer_with_mismatches}; diff --git a/crates/hir_ty/src/tests/regression.rs b/crates/hir_ty/src/tests/regression.rs index b9ab0f357..94d86b0d1 100644 --- a/crates/hir_ty/src/tests/regression.rs +++ b/crates/hir_ty/src/tests/regression.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use test_utils::mark; use super::{check_infer, check_types}; diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs index 59eb59d5f..48db23a34 100644 --- a/crates/hir_ty/src/tests/simple.rs +++ b/crates/hir_ty/src/tests/simple.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use super::{check_infer, check_types}; diff --git a/crates/hir_ty/src/tests/traits.rs b/crates/hir_ty/src/tests/traits.rs index 526e61caf..1f1056962 100644 --- a/crates/hir_ty/src/tests/traits.rs +++ b/crates/hir_ty/src/tests/traits.rs @@ -1,4 +1,4 @@ -use expect::expect; +use expect_test::expect; use test_utils::mark; use super::{check_infer, check_infer_with_mismatches, check_types}; -- cgit v1.2.3