]> git.lizzy.rs Git - rust.git/commitdiff
Switch to expect_test from crates.io
authorAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 21 Aug 2020 11:19:31 +0000 (13:19 +0200)
committerAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 21 Aug 2020 11:19:31 +0000 (13:19 +0200)
45 files changed:
Cargo.lock
crates/hir_def/Cargo.toml
crates/hir_def/src/import_map.rs
crates/hir_def/src/item_tree/tests.rs
crates/hir_def/src/nameres/tests.rs
crates/hir_ty/Cargo.toml
crates/hir_ty/src/tests.rs
crates/hir_ty/src/tests/coercion.rs
crates/hir_ty/src/tests/macros.rs
crates/hir_ty/src/tests/method_resolution.rs
crates/hir_ty/src/tests/never_type.rs
crates/hir_ty/src/tests/patterns.rs
crates/hir_ty/src/tests/regression.rs
crates/hir_ty/src/tests/simple.rs
crates/hir_ty/src/tests/traits.rs
crates/ide/Cargo.toml
crates/ide/src/call_info.rs
crates/ide/src/completion/complete_attribute.rs
crates/ide/src/completion/complete_dot.rs
crates/ide/src/completion/complete_fn_param.rs
crates/ide/src/completion/complete_keyword.rs
crates/ide/src/completion/complete_macro_in_item_position.rs
crates/ide/src/completion/complete_pattern.rs
crates/ide/src/completion/complete_postfix.rs
crates/ide/src/completion/complete_qualified_path.rs
crates/ide/src/completion/complete_record.rs
crates/ide/src/completion/complete_snippet.rs
crates/ide/src/completion/complete_trait_impl.rs
crates/ide/src/completion/complete_unqualified_path.rs
crates/ide/src/completion/presentation.rs
crates/ide/src/diagnostics.rs
crates/ide/src/display/navigation_target.rs
crates/ide/src/expand_macro.rs
crates/ide/src/file_structure.rs
crates/ide/src/hover.rs
crates/ide/src/inlay_hints.rs
crates/ide/src/references/rename.rs
crates/ide/src/runnables.rs
crates/ide/src/syntax_highlighting/tests.rs
crates/rust-analyzer/Cargo.toml
crates/rust-analyzer/src/diagnostics/to_proto.rs
crates/ssr/Cargo.toml
crates/ssr/src/tests.rs
crates/syntax/Cargo.toml
crates/syntax/src/tests.rs

index 5e0dc061fa2b21fd89fb533a3ad67c891905abc3..559154a8dc8e361e3482b66c6c1b5585f3402dcc 100644 (file)
@@ -345,12 +345,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "expect"
-version = "0.0.0"
+name = "expect-test"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e383741ea1982866572109d1a8c807bd36aad91fca701489fdca56ef92b3b8"
 dependencies = [
  "difference",
  "once_cell",
- "stdx",
 ]
 
 [[package]]
@@ -508,7 +509,7 @@ dependencies = [
  "cfg",
  "drop_bomb",
  "either",
- "expect",
+ "expect-test",
  "fst",
  "hir_expand",
  "indexmap",
@@ -553,7 +554,7 @@ dependencies = [
  "chalk-recursive",
  "chalk-solve",
  "ena",
- "expect",
+ "expect-test",
  "hir_def",
  "hir_expand",
  "itertools",
@@ -587,7 +588,7 @@ dependencies = [
  "base_db",
  "cfg",
  "either",
- "expect",
+ "expect-test",
  "hir",
  "ide_db",
  "indexmap",
@@ -1225,7 +1226,7 @@ dependencies = [
  "cfg",
  "crossbeam-channel",
  "env_logger",
- "expect",
+ "expect-test",
  "flycheck",
  "hir",
  "hir_def",
@@ -1452,7 +1453,7 @@ name = "ssr"
 version = "0.0.0"
 dependencies = [
  "base_db",
- "expect",
+ "expect-test",
  "hir",
  "ide_db",
  "itertools",
@@ -1494,7 +1495,7 @@ name = "syntax"
 version = "0.0.0"
 dependencies = [
  "arrayvec",
- "expect",
+ "expect-test",
  "itertools",
  "once_cell",
  "parser",
index 403bc2aff3e23f75c29477ab44aabe833a38c7ee..57745322fd8d432f95557b8c34ea7ab81bc1affc 100644 (file)
@@ -32,4 +32,4 @@ cfg = { path = "../cfg" }
 tt = { path = "../tt" }
 
 [dev-dependencies]
-expect = { path = "../expect" }
+expect-test = "0.1"
index d32a0bdaf2e99e165008a24fe56f11b3daa470ad..a442fb63a1be5d1ca1be51ae63ee6abf82a25766 100644 (file)
@@ -328,7 +328,7 @@ pub fn search_dependencies<'a>(
 #[cfg(test)]
 mod tests {
     use base_db::{fixture::WithFixture, SourceDatabase, Upcast};
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::{test_db::TestDB, AssocContainerId, Lookup};
 
index 9c5bf72bd504d9e480706bdcd108d06a2c2ca583..620e697d4a101af5cf0360321ba9291bc1f6a4fd 100644 (file)
@@ -1,5 +1,5 @@
 use base_db::fixture::WithFixture;
-use expect::{expect, Expect};
+use expect_test::{expect, Expect};
 use hir_expand::{db::AstDatabase, HirFileId, InFile};
 use rustc_hash::FxHashSet;
 use std::sync::Arc;
index b105d56b243bb7aa5b4e4c343a31e320c964f887..8aaf7a158ba42fa4141f334b9ef7ef6d3ad7a450 100644 (file)
@@ -7,7 +7,7 @@
 use std::sync::Arc;
 
 use base_db::{fixture::WithFixture, SourceDatabase};
-use expect::{expect, Expect};
+use expect_test::{expect, Expect};
 use test_utils::mark;
 
 use crate::{db::DefDatabase, nameres::*, test_db::TestDB};
index a319b0ce8e34cc535758f6d8063a3bba00c02d8b..06da0d0ec8d23c783a1bc465db7e1b911325342d 100644 (file)
@@ -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" }
index 91c9d38c52c3a4941d5221f8a31afb4d5e75055b..0445efc9e042a81f098bb29aae1c66ad74a5057a 100644 (file)
@@ -11,7 +11,7 @@
 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,
index 17efd75cb6b699538c7a97f49b8e6f7013e91185..7bc6c79f3ff85c1e3eeab1349c6e83306ba6a4b3 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 use test_utils::mark;
 
 use super::{check_infer, check_infer_with_mismatches};
index d887c7a7992107a49f6aba66c0e22eb2fd8d814c..597a195d0248a503257a054960c1c41f141c262b 100644 (file)
@@ -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};
index fa68355aa84734d9b95dfaf72866c0bf6bc6f6cc..23b2601e643b5d19de1849d61404a56fbe1248da 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 
 use super::{check_infer, check_types};
 
index 49538b572db3089cd3c33cb302deb6c65221ffac..335c474df767e81487ad1496261fcb826a7542c3 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 
 use super::{check_infer_with_mismatches, check_types};
 
index 39fabf7eb553da78447cfd7ea5af7aed6543e5d7..aeb191c79a77f826987652677dce6d6784bf3e9d 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 use test_utils::mark;
 
 use super::{check_infer, check_infer_with_mismatches};
index b9ab0f3576a9d3803e66b6bb0445c2ff33b039b9..94d86b0d1f232a292616d933697ddecacbedccc9 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 use test_utils::mark;
 
 use super::{check_infer, check_types};
index 59eb59d5fab036df05d68e98fdc919a910e52e6b..48db23a341609cbd1bed29ea4f4c35459e871138 100644 (file)
@@ -1,4 +1,4 @@
-use expect::expect;
+use expect_test::expect;
 
 use super::{check_infer, check_types};
 
index 526e61cafb460df57245dfc5566f740cee682bf4..1f1056962b7c8f99adabd59a34516edb3a3f61d5 100644 (file)
@@ -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};
index e4b970c73b4e701ecdd0a9f022734e454de0c470..700944430f3bc526abadd1178d2d0c61d1b71e45 100644 (file)
@@ -32,4 +32,4 @@ ssr = { path = "../ssr" }
 hir = { path = "../hir" }
 
 [dev-dependencies]
-expect = { path = "../expect" }
+expect-test = "0.1"
index 86abd2d8cec2beeaeac323cf8bee36b9d993c892..7e83a2381974c9ab3b29230007607f8cb8c5270e 100644 (file)
@@ -229,7 +229,7 @@ fn arg_list(&self) -> Option<ast::ArgList> {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::mark;
 
     use crate::mock_analysis::analysis_and_position;
index 042c3ecefb7e29d2a11bd15deafc6dcd58384687..0abfaebcbc669f4b887d9f33560c8a6f3d2567f9 100644 (file)
@@ -383,7 +383,7 @@ pub(super) struct LintCompletion {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index 5488db43f72086b244ec6d2188a6e18f649b48a2..0b9f1798acafb6624dde9eee4348dc02edafe090 100644 (file)
@@ -61,7 +61,7 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &T
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::mark;
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
index 7c63ce58f8932728777893df7b897349830575c2..9efe254618eee4e168bd85f392f51fba2d629a86 100644 (file)
@@ -66,7 +66,7 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index 22ada3cf2937d69666f1657c49a2e8444c9f8019..95e4ff1ac6aa01cac94f1d3432286fd2fda894b2 100644 (file)
@@ -174,7 +174,7 @@ fn complete_return(
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{
         test_utils::{check_edit, completion_list},
index 0447f0511515401aaf605dbaa727677ed9d0b2b6..fc8625d8e0a027a787c54c3e578bef6810035bfc 100644 (file)
@@ -15,7 +15,7 @@ pub(super) fn complete_macro_in_item_position(acc: &mut Completions, ctx: &Compl
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index aceb77cb5ccc2ddbbda05ec2f8ec9287b23e7414..5a13574d45b0ab180a555751cc4602eb665b836d 100644 (file)
@@ -33,7 +33,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index d50b13c52c39cdd883b27f43a2a8e4b7c262b3ca..84c4e129d27145535715fddf6f460bdcb08a2e83 100644 (file)
@@ -238,7 +238,7 @@ fn postfix_snippet(
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{
         test_utils::{check_edit, completion_list},
index 74794dc88bf52ed79d208061d6a1642ac1c55cc7..accb09f7e8c874cbc646a0ddde2a5ccc51f33c60 100644 (file)
@@ -146,7 +146,7 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::mark;
 
     use crate::completion::{
index 74b94594dca697598f845c4de3f9b49743dfbd70..ceb8d16c10017d10ed3f96e9b40bf2d130457c77 100644 (file)
@@ -18,7 +18,7 @@ pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index 4368e4eec8422274135bdbd68f62bd8e3d9f5d92..c3b03b199e7902e54939c9a6375e25971f78b4ff 100644 (file)
@@ -70,7 +70,7 @@ fn ${1:feature}() {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{test_utils::completion_list, CompletionKind};
 
index d0d3a9f34d15d44507deb5f70f642143f829c43e..1a2b1e8a57e8b6c287d9df9d141a7424c73ed34a 100644 (file)
@@ -225,7 +225,7 @@ fn make_const_compl_syntax(const_: &ast::Const) -> String {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::completion::{
         test_utils::{check_edit, completion_list},
index 824227f310a936647042c38c243bc96899367881..1f1b682a78c98a7ccba16447d0571441eeda82e7 100644 (file)
@@ -64,7 +64,7 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::mark;
 
     use crate::completion::{
index a73f8ab0b927fd8552063c0cf28ca941bb78c7d8..3371aed2dfa33fba541b8b8e32a320aa5c65bdcc 100644 (file)
@@ -464,7 +464,7 @@ fn guess_macro_braces(macro_name: &str, docs: &str) -> (&'static str, &'static s
 mod tests {
     use std::cmp::Reverse;
 
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::mark;
 
     use crate::{
index 92b5adaa2abb251627bbabfaa48a24dfdae43a78..b2b972b02cb8176b532229b40a7d921d0d573a14 100644 (file)
@@ -214,7 +214,7 @@ fn check_struct_shorthand_initialization(
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use stdx::trim_indent;
     use test_utils::assert_eq_text;
 
index e77106177267785d7d26cd9b2bf06b028daf876a..1ee80c2dd4e92f724eaf8303f9610332c8632789 100644 (file)
@@ -421,7 +421,7 @@ pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) ->
 
 #[cfg(test)]
 mod tests {
-    use expect::expect;
+    use expect_test::expect;
 
     use crate::{mock_analysis::single_file, Query};
 
index 31455709d7d8ad5bbccde3ddfe970e5d9431caa4..8a285bcf7a9698b0b4172d17efb345a6198d245d 100644 (file)
@@ -120,7 +120,7 @@ fn is_text(k: SyntaxKind) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::mock_analysis::analysis_and_position;
 
index c90247ba658242f1d9aacf5e839b3ee44d8c6622..6168fb837ccaee180eee7c62e31d4b4a7df62135 100644 (file)
@@ -164,7 +164,7 @@ fn collapse_ws(node: &SyntaxNode, output: &mut String) {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use super::*;
 
index 300c00edc829f303a6e4ba2e730cfeaf9ea042c0..c75b2a51056af9c604a9e8e487d8fcf9d8381f47 100644 (file)
@@ -353,7 +353,7 @@ fn priority(n: &SyntaxToken) -> usize {
 #[cfg(test)]
 mod tests {
     use base_db::FileLoader;
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::mock_analysis::analysis_and_position;
 
index 596bc872dbaadfc3ecda4fbbb975a80746adb74e..583f39d85ba22e57cbf987ee985586aec68f8ed8 100644 (file)
@@ -336,7 +336,7 @@ fn get_callable(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<Call
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use test_utils::extract_annotations;
 
     use crate::{inlay_hints::InlayHintsConfig, mock_analysis::single_file};
index d73dc9cd00b0ae2b56834d071054d35729603005..3016297633be58d2d1f12a5a8b96608fe7220105 100644 (file)
@@ -270,7 +270,7 @@ fn rename_reference(
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
     use stdx::trim_indent;
     use test_utils::{assert_eq_text, mark};
     use text_edit::TextEdit;
index c3e07c8dec731f8b2ca7448a4f345bd58f636b6a..4139f329eb654274124c70554d5a36f11735147d 100644 (file)
@@ -268,7 +268,7 @@ fn has_test_function_or_multiple_test_submodules(module: &ast::Module) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use expect::{expect, Expect};
+    use expect_test::{expect, Expect};
 
     use crate::mock_analysis::analysis_and_position;
 
index ccb76f5529377cfbce0513c6ed7f122a0870149d..1c3fea0588b8457a1feeee4574940badd9ae41ee 100644 (file)
@@ -1,6 +1,6 @@
 use std::fs;
 
-use expect::{expect_file, ExpectFile};
+use expect_test::{expect_file, ExpectFile};
 use test_utils::project_dir;
 
 use crate::{mock_analysis::single_file, FileRange, TextRange};
index c7c1eda0fda4a019c2934f709fbcfd18b29212a0..068a961dc619a09f505f9bd3b405e1c1fd37b08f 100644 (file)
@@ -57,7 +57,7 @@ proc_macro_srv = { path = "../proc_macro_srv" }
 winapi = "0.3.8"
 
 [dev-dependencies]
-expect = { path = "../expect" }
+expect-test = "0.1"
 test_utils = { path = "../test_utils" }
 mbe = { path = "../mbe" }
 tt = { path = "../tt" }
index df55838973a4f657f0aa50e9a72f1a5fb3b244dc..e52b97913a3dda062b2ea80526cdfb7738ea2112 100644 (file)
@@ -256,7 +256,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
 mod tests {
     use super::*;
 
-    use expect::{expect_file, ExpectFile};
+    use expect_test::{expect_file, ExpectFile};
 
     fn check(diagnostics_json: &str, expect: ExpectFile) {
         check_with_config(DiagnosticsMapConfig::default(), diagnostics_json, expect)
index 7c2090de3cc59d9640e7376c46966489aa4ff5ea..22b6af0fabe75952007452d58520a6cfd8571db3 100644 (file)
@@ -22,4 +22,4 @@ hir = { path = "../hir" }
 test_utils = { path = "../test_utils" }
 
 [dev-dependencies]
-expect = { path = "../expect" }
+expect-test = "0.1"
index e45c88864d7aabc0d106d1f240575b2cd15e0fc6..20231a9bc6010a9da1bc6fa0a57d6a8c009ce303 100644 (file)
@@ -1,6 +1,6 @@
 use crate::{MatchFinder, SsrRule};
 use base_db::{salsa::Durability, FileId, FilePosition, FileRange, SourceDatabaseExt};
-use expect::{expect, Expect};
+use expect_test::{expect, Expect};
 use rustc_hash::FxHashSet;
 use std::sync::Arc;
 use test_utils::{mark, RangeOrOffset};
index ec3132da8d771ad9f5375edfbec1ed5e20e7eed2..6818f3ad8892bed4cb4d21e8088246ad3db06042 100644 (file)
@@ -30,6 +30,6 @@ parser = { path = "../parser" }
 [dev-dependencies]
 walkdir = "2.3.1"
 rayon = "1"
+expect-test = "0.1"
 
 test_utils = { path = "../test_utils" }
-expect = { path = "../expect" }
index ddc71836940c253772d9e98bb6a30b6621b29250..8c217dfe01ec851258194af80776fbb0877c739d 100644 (file)
@@ -4,7 +4,7 @@
     path::{Path, PathBuf},
 };
 
-use expect::expect_file;
+use expect_test::expect_file;
 use rayon::prelude::*;
 use test_utils::project_dir;