Merge #1738

1738: :arrow_up: insta r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

4 files changed, 37 insertions, 37 deletions

diff --git a/crates/ra_hir/src/nameres/tests/globs.rs b/crates/ra_hir/src/nameres/tests/globs.rs
index e1519ca6b..7ac22b47b 100644
--- a/crates/ra_hir/src/nameres/tests/globs.rs
+++ b/crates/ra_hir/src/nameres/tests/globs.rs
@@ -17,7 +17,7 @@ fn glob_1() {
         pub struct Baz;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Baz: t v
    ⋮Foo: t v
@@ -53,7 +53,7 @@ fn glob_2() {
         pub use super::*;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Baz: t v
    ⋮Foo: t v
@@ -89,7 +89,7 @@ fn glob_across_crates() {
             "test_crate": ("/lib.rs", []),
         },
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Baz: t v
     "###
@@ -108,7 +108,7 @@ fn glob_enum() {
         use self::Foo::*;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Bar: t v
    ⋮Baz: t v
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs
index 4e04740eb..631df2cef 100644
--- a/crates/ra_hir/src/nameres/tests/macros.rs
+++ b/crates/ra_hir/src/nameres/tests/macros.rs
@@ -17,7 +17,7 @@ fn macro_rules_are_globally_visible() {
         structs!(Bar, Baz);
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Foo: t v
    ⋮nested: t
@@ -45,7 +45,7 @@ fn macro_rules_can_define_modules() {
         struct X;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮m: m
    ⋮n1: t
@@ -82,7 +82,7 @@ fn macro_rules_from_other_crates_are_visible() {
             "foo": ("/lib.rs", []),
         },
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Bar: t v
    ⋮Foo: t v
@@ -129,7 +129,7 @@ fn unexpanded_macro_should_expand_by_fixedpoint_loop() {
             "foo": ("/lib.rs", []),
         },
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮Foo: t v
    ⋮bar: m
diff --git a/crates/ra_hir/src/nameres/tests/mods.rs b/crates/ra_hir/src/nameres/tests/mods.rs
index 6dd18df1a..4f8398460 100644
--- a/crates/ra_hir/src/nameres/tests/mods.rs
+++ b/crates/ra_hir/src/nameres/tests/mods.rs
@@ -19,7 +19,7 @@ fn name_res_works_for_broken_modules() {
         pub struct Baz;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Baz: _
     "###);
@@ -41,7 +41,7 @@ fn module_resolution_works_for_non_standard_filenames() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Bar: t v
         ⋮foo: t
@@ -67,7 +67,7 @@ fn module_resolution_works_for_raw_modules() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Bar: t v
         ⋮async: t
@@ -94,7 +94,7 @@ fn module_resolution_decl_path() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Bar: t v
         ⋮foo: t
@@ -110,7 +110,7 @@ fn module_resolution_module_with_path_in_mod_rs() {
         r###"
         //- /main.rs
         mod foo;
-        
+
         //- /foo/mod.rs
         #[path = "baz.rs"]
         pub mod bar;
@@ -125,7 +125,7 @@ fn module_resolution_module_with_path_in_mod_rs() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -144,7 +144,7 @@ fn module_resolution_module_with_path_non_crate_root() {
         r###"
         //- /main.rs
         mod foo;
-        
+
         //- /foo.rs
         #[path = "baz.rs"]
         pub mod bar;
@@ -159,7 +159,7 @@ fn module_resolution_module_with_path_non_crate_root() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -189,7 +189,7 @@ fn module_resolution_module_decl_path_super() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Baz: t v
         ⋮foo: t
@@ -215,7 +215,7 @@ fn module_resolution_explicit_path_mod_rs() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -243,7 +243,7 @@ fn module_resolution_relative_path() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -274,7 +274,7 @@ fn module_resolution_relative_path_2() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -302,7 +302,7 @@ fn module_resolution_explicit_path_mod_rs_2() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -327,7 +327,7 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -354,7 +354,7 @@ fn module_resolution_decl_inside_inline_module_with_path_attribute() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -383,7 +383,7 @@ fn module_resolution_decl_inside_inline_module() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -413,7 +413,7 @@ fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -444,7 +444,7 @@ fn module_resolution_decl_inside_inline_module_3() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -475,7 +475,7 @@ fn module_resolution_decl_inside_inline_module_empty_path() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -503,7 +503,7 @@ fn module_resolution_decl_empty_path() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -530,7 +530,7 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -561,7 +561,7 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮Baz: t v
         ⋮foo: t
@@ -596,7 +596,7 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -634,7 +634,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -672,7 +672,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
         },
     );
 
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
         ⋮crate
         ⋮foo: t
         ⋮
@@ -701,8 +701,8 @@ fn unresolved_module_diagnostics() {
     )
     .diagnostics();
 
-    assert_snapshot_matches!(diagnostics, @r###"
-"mod bar;": unresolved module
-"###
+    assert_snapshot!(diagnostics, @r###"
+    "mod bar;": unresolved module
+    "###
     );
 }
diff --git a/crates/ra_hir/src/nameres/tests/primitives.rs b/crates/ra_hir/src/nameres/tests/primitives.rs
index 734744835..0e2708658 100644
--- a/crates/ra_hir/src/nameres/tests/primitives.rs
+++ b/crates/ra_hir/src/nameres/tests/primitives.rs
@@ -12,7 +12,7 @@ fn primitive_reexport() {
         pub use i32 as int;
         ",
     );
-    assert_snapshot_matches!(map, @r###"
+    assert_snapshot!(map, @r###"
    ⋮crate
    ⋮foo: t
    ⋮int: t