From 6fba51c5fc05264abcbf971dcf28142746588d74 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 3 Nov 2019 23:35:48 +0300
Subject: move crate_def_map tests to hir_def

---
 crates/ra_hir/src/nameres/tests/globs.rs          | 118 ----
 crates/ra_hir/src/nameres/tests/incremental.rs    | 140 ----
 crates/ra_hir/src/nameres/tests/macros.rs         | 635 ------------------
 crates/ra_hir/src/nameres/tests/mod_resolution.rs | 759 ----------------------
 crates/ra_hir/src/nameres/tests/primitives.rs     |  24 -
 5 files changed, 1676 deletions(-)
 delete mode 100644 crates/ra_hir/src/nameres/tests/globs.rs
 delete mode 100644 crates/ra_hir/src/nameres/tests/incremental.rs
 delete mode 100644 crates/ra_hir/src/nameres/tests/macros.rs
 delete mode 100644 crates/ra_hir/src/nameres/tests/mod_resolution.rs
 delete mode 100644 crates/ra_hir/src/nameres/tests/primitives.rs

(limited to 'crates/ra_hir/src/nameres/tests')

diff --git a/crates/ra_hir/src/nameres/tests/globs.rs b/crates/ra_hir/src/nameres/tests/globs.rs
deleted file mode 100644
index b3e4d8d94..000000000
--- a/crates/ra_hir/src/nameres/tests/globs.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use super::*;
-
-#[test]
-fn glob_1() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod foo;
-        use foo::*;
-
-        //- /foo/mod.rs
-        pub mod bar;
-        pub use self::bar::Baz;
-        pub struct Foo;
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Baz: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮foo: t
-   ⋮
-   ⋮crate::foo
-   ⋮Baz: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::foo::bar
-   ⋮Baz: t v
-    "###
-    );
-}
-
-#[test]
-fn glob_2() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod foo;
-        use foo::*;
-
-        //- /foo/mod.rs
-        pub mod bar;
-        pub use self::bar::*;
-        pub struct Foo;
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        pub use super::*;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Baz: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮foo: t
-   ⋮
-   ⋮crate::foo
-   ⋮Baz: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::foo::bar
-   ⋮Baz: t v
-   ⋮Foo: t v
-   ⋮bar: t
-    "###
-    );
-}
-
-#[test]
-fn glob_across_crates() {
-    // covers!(glob_across_crates);
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        use test_crate::*;
-
-        //- /lib.rs
-        pub struct Baz;
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["test_crate"]),
-            "test_crate": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Baz: t v
-    "###
-    );
-}
-
-#[test]
-fn glob_enum() {
-    // covers!(glob_enum);
-    let map = def_map(
-        "
-        //- /lib.rs
-        enum Foo {
-            Bar, Baz
-        }
-        use self::Foo::*;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Baz: t v
-   ⋮Foo: t
-    "###
-    );
-}
diff --git a/crates/ra_hir/src/nameres/tests/incremental.rs b/crates/ra_hir/src/nameres/tests/incremental.rs
deleted file mode 100644
index 723ece7b0..000000000
--- a/crates/ra_hir/src/nameres/tests/incremental.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::sync::Arc;
-
-use ra_db::{SourceDatabase, SourceDatabaseExt};
-
-use super::*;
-
-fn check_def_map_is_not_recomputed(initial: &str, file_change: &str) {
-    let (mut db, pos) = MockDatabase::with_position(initial);
-    let krate = db.crate_graph().iter().next().unwrap();
-    {
-        let events = db.log_executed(|| {
-            db.crate_def_map(krate);
-        });
-        assert!(format!("{:?}", events).contains("crate_def_map"), "{:#?}", events)
-    }
-    db.set_file_text(pos.file_id, Arc::new(file_change.to_string()));
-
-    {
-        let events = db.log_executed(|| {
-            db.crate_def_map(krate);
-        });
-        assert!(!format!("{:?}", events).contains("crate_def_map"), "{:#?}", events)
-    }
-}
-
-#[test]
-fn typing_inside_a_function_should_not_invalidate_def_map() {
-    check_def_map_is_not_recomputed(
-        "
-        //- /lib.rs
-        mod foo;<|>
-
-        use crate::foo::bar::Baz;
-
-        fn foo() -> i32 {
-            1 + 1
-        }
-        //- /foo/mod.rs
-        pub mod bar;
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        ",
-        "
-        mod foo;
-
-        use crate::foo::bar::Baz;
-
-        fn foo() -> i32 { 92 }
-        ",
-    );
-}
-
-#[test]
-fn adding_inner_items_should_not_invalidate_def_map() {
-    check_def_map_is_not_recomputed(
-        "
-        //- /lib.rs
-        struct S { a: i32}
-        enum E { A }
-        trait T {
-            fn a() {}
-        }
-        mod foo;<|>
-        impl S {
-            fn a() {}
-        }
-        use crate::foo::bar::Baz;
-        //- /foo/mod.rs
-        pub mod bar;
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        ",
-        "
-        struct S { a: i32, b: () }
-        enum E { A, B }
-        trait T {
-            fn a() {}
-            fn b() {}
-        }
-        mod foo;<|>
-        impl S {
-            fn a() {}
-            fn b() {}
-        }
-        use crate::foo::bar::Baz;
-        ",
-    );
-}
-
-#[test]
-fn typing_inside_a_macro_should_not_invalidate_def_map() {
-    let (mut db, pos) = MockDatabase::with_position(
-        "
-        //- /lib.rs
-        macro_rules! m {
-            ($ident:ident) => {
-                fn f() {
-                    $ident + $ident;
-                };
-            }
-        }
-        mod foo;
-
-        //- /foo/mod.rs
-        pub mod bar;
-
-        //- /foo/bar.rs
-        <|>
-        m!(X);
-        ",
-    );
-    {
-        let events = db.log_executed(|| {
-            let src = crate::Source {
-                file_id: pos.file_id.into(),
-                ast: crate::ModuleSource::new(&db, Some(pos.file_id), None),
-            };
-            let module = crate::Module::from_definition(&db, src).unwrap();
-            let decls = module.declarations(&db);
-            assert_eq!(decls.len(), 18);
-        });
-        assert!(format!("{:?}", events).contains("crate_def_map"), "{:#?}", events)
-    }
-    db.set_file_text(pos.file_id, Arc::new("m!(Y);".to_string()));
-
-    {
-        let events = db.log_executed(|| {
-            let src = crate::Source {
-                file_id: pos.file_id.into(),
-                ast: crate::ModuleSource::new(&db, Some(pos.file_id), None),
-            };
-            let module = crate::Module::from_definition(&db, src).unwrap();
-            let decls = module.declarations(&db);
-            assert_eq!(decls.len(), 18);
-        });
-        assert!(!format!("{:?}", events).contains("crate_def_map"), "{:#?}", events)
-    }
-}
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs
deleted file mode 100644
index 78bb0eb0d..000000000
--- a/crates/ra_hir/src/nameres/tests/macros.rs
+++ /dev/null
@@ -1,635 +0,0 @@
-use super::*;
-
-#[test]
-fn macro_rules_are_globally_visible() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        macro_rules! structs {
-            ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
-            }
-        }
-        structs!(Foo);
-        mod nested;
-
-        //- /nested.rs
-        structs!(Bar, Baz);
-        ",
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Foo: t v
-   ⋮nested: t
-   ⋮
-   ⋮crate::nested
-   ⋮Bar: t v
-   ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn macro_rules_can_define_modules() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        macro_rules! m {
-            ($name:ident) => { mod $name;  }
-        }
-        m!(n1);
-
-        mod m {
-            m!(n3)
-        }
-
-        //- /n1.rs
-        m!(n2)
-        //- /n1/n2.rs
-        struct X;
-        //- /m/n3.rs
-        struct Y;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-    crate
-    m: t
-    n1: t
-    
-    crate::m
-    n3: t
-    
-    crate::m::n3
-    Y: t v
-    
-    crate::n1
-    n2: t
-    
-    crate::n1::n2
-    X: t v
-    "###);
-}
-
-#[test]
-fn macro_rules_from_other_crates_are_visible() {
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        foo::structs!(Foo, Bar)
-        mod bar;
-
-        //- /bar.rs
-        use crate::*;
-
-        //- /lib.rs
-        #[macro_export]
-        macro_rules! structs {
-            ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
-            }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-    "###);
-}
-
-#[test]
-fn macro_rules_export_with_local_inner_macros_are_visible() {
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        foo::structs!(Foo, Bar)
-        mod bar;
-
-        //- /bar.rs
-        use crate::*;
-
-        //- /lib.rs
-        #[macro_export(local_inner_macros)]
-        macro_rules! structs {
-            ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
-            }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-    "###);
-}
-
-#[test]
-fn unexpanded_macro_should_expand_by_fixedpoint_loop() {
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        macro_rules! baz {
-            () => {
-                use foo::bar;
-            }
-        }
-
-        foo!();
-        bar!();
-        baz!();
-
-        //- /lib.rs
-        #[macro_export]
-        macro_rules! foo {
-            () => {
-                struct Foo { field: u32 }
-            }
-        }
-        #[macro_export]
-        macro_rules! bar {
-            () => {
-                use foo::foo;
-            }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Foo: t v
-   ⋮bar: m
-   ⋮foo: m
-    "###);
-}
-
-#[test]
-fn macro_rules_from_other_crates_are_visible_with_macro_use() {
-    // covers!(macro_rules_from_other_crates_are_visible_with_macro_use);
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        structs!(Foo);
-        structs_priv!(Bar);
-        structs_not_exported!(MacroNotResolved1);
-        crate::structs!(MacroNotResolved2);
-
-        mod bar;
-
-        #[macro_use]
-        extern crate foo;
-
-        //- /bar.rs
-        structs!(Baz);
-        crate::structs!(MacroNotResolved3);
-
-        //- /lib.rs
-        #[macro_export]
-        macro_rules! structs {
-            ($i:ident) => { struct $i; }
-        }
-
-        macro_rules! structs_not_exported {
-            ($i:ident) => { struct $i; }
-        }
-
-        mod priv_mod {
-            #[macro_export]
-            macro_rules! structs_priv {
-                ($i:ident) => { struct $i; }
-            }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮foo: t
-   ⋮
-   ⋮crate::bar
-   ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn prelude_is_macro_use() {
-    // covers!(prelude_is_macro_use);
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        structs!(Foo);
-        structs_priv!(Bar);
-        structs_outside!(Out);
-        crate::structs!(MacroNotResolved2);
-
-        mod bar;
-
-        //- /bar.rs
-        structs!(Baz);
-        crate::structs!(MacroNotResolved3);
-
-        //- /lib.rs
-        #[prelude_import]
-        use self::prelude::*;
-
-        mod prelude {
-            #[macro_export]
-            macro_rules! structs {
-                ($i:ident) => { struct $i; }
-            }
-
-            mod priv_mod {
-                #[macro_export]
-                macro_rules! structs_priv {
-                    ($i:ident) => { struct $i; }
-                }
-            }
-        }
-
-        #[macro_export]
-        macro_rules! structs_outside {
-            ($i:ident) => { struct $i; }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮Out: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn prelude_cycle() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        #[prelude_import]
-        use self::prelude::*;
-
-        declare_mod!();
-
-        mod prelude {
-            macro_rules! declare_mod {
-                () => (mod foo {})
-            }
-        }
-        ",
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮prelude: t
-        ⋮
-        ⋮crate::prelude
-    "###);
-}
-
-#[test]
-fn plain_macros_are_legacy_textual_scoped() {
-    let map = def_map(
-        r#"
-        //- /main.rs
-        mod m1;
-        bar!(NotFoundNotMacroUse);
-
-        mod m2 {
-            foo!(NotFoundBeforeInside2);
-        }
-
-        macro_rules! foo {
-            ($x:ident) => { struct $x; }
-        }
-        foo!(Ok);
-
-        mod m3;
-        foo!(OkShadowStop);
-        bar!(NotFoundMacroUseStop);
-
-        #[macro_use]
-        mod m5 {
-            #[macro_use]
-            mod m6 {
-                macro_rules! foo {
-                    ($x:ident) => { fn $x() {} }
-                }
-            }
-        }
-        foo!(ok_double_macro_use_shadow);
-
-        baz!(NotFoundBefore);
-        #[macro_use]
-        mod m7 {
-            macro_rules! baz {
-                ($x:ident) => { struct $x; }
-            }
-        }
-        baz!(OkAfter);
-
-        //- /m1.rs
-        foo!(NotFoundBeforeInside1);
-        macro_rules! bar {
-            ($x:ident) => { struct $x; }
-        }
-
-        //- /m3/mod.rs
-        foo!(OkAfterInside);
-        macro_rules! foo {
-            ($x:ident) => { fn $x() {} }
-        }
-        foo!(ok_shadow);
-
-        #[macro_use]
-        mod m4;
-        bar!(OkMacroUse);
-
-        //- /m3/m4.rs
-        foo!(ok_shadow_deep);
-        macro_rules! bar {
-            ($x:ident) => { struct $x; }
-        }
-        "#,
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Ok: t v
-   ⋮OkAfter: t v
-   ⋮OkShadowStop: t v
-   ⋮m1: t
-   ⋮m2: t
-   ⋮m3: t
-   ⋮m5: t
-   ⋮m7: t
-   ⋮ok_double_macro_use_shadow: v
-   ⋮
-   ⋮crate::m7
-   ⋮
-   ⋮crate::m1
-   ⋮
-   ⋮crate::m5
-   ⋮m6: t
-   ⋮
-   ⋮crate::m5::m6
-   ⋮
-   ⋮crate::m2
-   ⋮
-   ⋮crate::m3
-   ⋮OkAfterInside: t v
-   ⋮OkMacroUse: t v
-   ⋮m4: t
-   ⋮ok_shadow: v
-   ⋮
-   ⋮crate::m3::m4
-   ⋮ok_shadow_deep: v
-    "###);
-}
-
-#[test]
-fn type_value_macro_live_in_different_scopes() {
-    let map = def_map(
-        "
-        //- /main.rs
-        #[macro_export]
-        macro_rules! foo {
-            ($x:ident) => { type $x = (); }
-        }
-
-        foo!(foo);
-        use foo as bar;
-
-        use self::foo as baz;
-        fn baz() {}
-        ",
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮bar: t m
-        ⋮baz: t v m
-        ⋮foo: t m
-    "###);
-}
-
-#[test]
-fn macro_use_can_be_aliased() {
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        #[macro_use]
-        extern crate foo;
-
-        foo!(Direct);
-        bar!(Alias);
-
-        //- /lib.rs
-        use crate::foo as bar;
-
-        mod m {
-            #[macro_export]
-            macro_rules! foo {
-                ($x:ident) => { struct $x; }
-            }
-        }
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Alias: t v
-        ⋮Direct: t v
-        ⋮foo: t
-    "###);
-}
-
-#[test]
-fn path_qualified_macros() {
-    let map = def_map(
-        "
-        //- /main.rs
-        macro_rules! foo {
-            ($x:ident) => { struct $x; }
-        }
-
-        crate::foo!(NotResolved);
-
-        crate::bar!(OkCrate);
-        bar!(OkPlain);
-        alias1!(NotHere);
-        m::alias1!(OkAliasPlain);
-        m::alias2!(OkAliasSuper);
-        m::alias3!(OkAliasCrate);
-        not_found!(NotFound);
-
-        mod m {
-            #[macro_export]
-            macro_rules! bar {
-                ($x:ident) => { struct $x; }
-            }
-
-            pub use bar as alias1;
-            pub use super::bar as alias2;
-            pub use crate::bar as alias3;
-            pub use self::bar as not_found;
-        }
-        ",
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮OkAliasCrate: t v
-        ⋮OkAliasPlain: t v
-        ⋮OkAliasSuper: t v
-        ⋮OkCrate: t v
-        ⋮OkPlain: t v
-        ⋮bar: m
-        ⋮m: t
-        ⋮
-        ⋮crate::m
-        ⋮alias1: m
-        ⋮alias2: m
-        ⋮alias3: m
-        ⋮not_found: _
-    "###);
-}
-
-#[test]
-fn macro_dollar_crate_is_correct_in_item() {
-    // covers!(macro_dollar_crate_self);
-    // covers!(macro_dollar_crate_other);
-    let map = def_map_with_crate_graph(
-        "
-        //- /main.rs
-        #[macro_use]
-        extern crate foo;
-
-        #[macro_use]
-        mod m {
-            macro_rules! current {
-                () => {
-                    use $crate::Foo as FooSelf;
-                }
-            }
-        }
-
-        struct Foo;
-
-        current!();
-        not_current1!();
-        foo::not_current2!();
-
-        //- /lib.rs
-        mod m {
-            #[macro_export]
-            macro_rules! not_current1 {
-                () => {
-                    use $crate::Bar;
-                }
-            }
-        }
-
-        #[macro_export]
-        macro_rules! not_current2 {
-            () => {
-                use $crate::Baz;
-            }
-        }
-
-        struct Bar;
-        struct Baz;
-        ",
-        crate_graph! {
-            "main": ("/main.rs", ["foo"]),
-            "foo": ("/lib.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮Baz: t v
-        ⋮Foo: t v
-        ⋮FooSelf: t v
-        ⋮foo: t
-        ⋮m: t
-        ⋮
-        ⋮crate::m
-    "###);
-}
-
-#[test]
-fn macro_dollar_crate_is_correct_in_indirect_deps() {
-    // covers!(macro_dollar_crate_other);
-    // From std
-    let map = def_map_with_crate_graph(
-        r#"
-        //- /main.rs
-        foo!();
-
-        //- /std.rs
-        #[prelude_import]
-        use self::prelude::*;
-
-        pub use core::foo;
-
-        mod prelude {}
-
-        #[macro_use]
-        mod std_macros;
-
-        //- /core.rs
-        #[macro_export]
-        macro_rules! foo {
-            () => {
-                use $crate::bar;
-            }
-        }
-
-        pub struct bar;
-        "#,
-        crate_graph! {
-            "main": ("/main.rs", ["std"]),
-            "std": ("/std.rs", ["core"]),
-            "core": ("/core.rs", []),
-        },
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮bar: t v
-    "###);
-}
diff --git a/crates/ra_hir/src/nameres/tests/mod_resolution.rs b/crates/ra_hir/src/nameres/tests/mod_resolution.rs
deleted file mode 100644
index abfe8b1c3..000000000
--- a/crates/ra_hir/src/nameres/tests/mod_resolution.rs
+++ /dev/null
@@ -1,759 +0,0 @@
-use super::*;
-
-#[test]
-fn name_res_works_for_broken_modules() {
-    // covers!(name_res_works_for_broken_modules);
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod foo // no `;`, no body
-
-        use self::foo::Baz;
-
-        //- /foo/mod.rs
-        pub mod bar;
-
-        pub use self::bar::Baz;
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: _
-    "###);
-}
-
-#[test]
-fn nested_module_resolution() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod n1;
-
-        //- /n1.rs
-        mod n2;
-
-        //- /n1/n2.rs
-        struct X;
-        ",
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮n1: t
-        ⋮
-        ⋮crate::n1
-        ⋮n2: t
-        ⋮
-        ⋮crate::n1::n2
-        ⋮X: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_works_for_non_standard_filenames() {
-    let map = def_map_with_crate_graph(
-        "
-        //- /my_library.rs
-        mod foo;
-        use self::foo::Bar;
-
-        //- /foo/mod.rs
-        pub struct Bar;
-        ",
-        crate_graph! {
-            "my_library": ("/my_library.rs", []),
-        },
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Bar: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_works_for_raw_modules() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod r#async;
-        use self::r#async::Bar;
-
-        //- /async.rs
-        pub struct Bar;
-        ",
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮async: t
-        ⋮
-        ⋮crate::async
-        ⋮Bar: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_path() {
-    let map = def_map(
-        r###"
-        //- /lib.rs
-        #[path = "bar/baz/foo.rs"]
-        mod foo;
-        use self::foo::Bar;
-
-        //- /bar/baz/foo.rs
-        pub struct Bar;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Bar: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_module_with_path_in_mod_rs() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo/mod.rs
-        #[path = "baz.rs"]
-        pub mod bar;
-
-        use self::bar::Baz;
-
-        //- /foo/baz.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_module_with_path_non_crate_root() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo.rs
-        #[path = "baz.rs"]
-        pub mod bar;
-
-        use self::bar::Baz;
-
-        //- /baz.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_module_decl_path_super() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "bar/baz/module.rs"]
-        mod foo;
-        pub struct Baz;
-
-        //- /bar/baz/module.rs
-        use super::Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_explicit_path_mod_rs() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "module/mod.rs"]
-        mod foo;
-
-        //- /module/mod.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_relative_path() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo.rs
-        #[path = "./sub.rs"]
-        pub mod foo_bar;
-
-        //- /sub.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮foo_bar: t
-        ⋮
-        ⋮crate::foo::foo_bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_relative_path_2() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo/mod.rs
-        #[path="../sub.rs"]
-        pub mod foo_bar;
-
-        //- /sub.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮foo_bar: t
-        ⋮
-        ⋮crate::foo::foo_bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_explicit_path_mod_rs_2() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "module/bar/mod.rs"]
-        mod foo;
-
-        //- /module/bar/mod.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_explicit_path_mod_rs_with_win_separator() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "module\bar\mod.rs"]
-        mod foo;
-
-        //- /module/bar/mod.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_with_path_attribute() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "models"]
-        mod foo {
-            mod bar;
-        }
-
-        //- /models/bar.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo {
-            mod bar;
-        }
-
-        //- /foo/bar.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "models/db"]
-        mod foo {
-            mod bar;
-        }
-
-        //- /models/db/bar.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_3() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "models/db"]
-        mod foo {
-            #[path = "users.rs"]
-            mod bar;
-        }
-
-        //- /models/db/users.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_empty_path() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = ""]
-        mod foo {
-            #[path = "users.rs"]
-            mod bar;
-        }
-
-        //- /users.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_empty_path() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = ""] // Should try to read `/` (a directory)
-        mod foo;
-
-        //- /foo.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_relative_path() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path = "./models"]
-        mod foo {
-            mod bar;
-        }
-
-        //- /models/bar.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_in_crate_root() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo {
-            #[path = "baz.rs"]
-            mod bar;
-        }
-        use self::foo::bar::Baz;
-
-        //- /foo/baz.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_in_mod_rs() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo/mod.rs
-        mod bar {
-            #[path = "qwe.rs"]
-            pub mod baz;
-        }
-        use self::bar::baz::Baz;
-
-        //- /foo/bar/qwe.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo.rs
-        mod bar {
-            #[path = "qwe.rs"]
-            pub mod baz;
-        }
-        use self::bar::baz::Baz;
-
-        //- /foo/bar/qwe.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        mod foo;
-
-        //- /foo.rs
-        #[path = "bar"]
-        mod bar {
-            pub mod baz;
-        }
-        use self::bar::baz::Baz;
-
-        //- /bar/baz.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn unresolved_module_diagnostics() {
-    let diagnostics = MockDatabase::with_files(
-        r"
-        //- /lib.rs
-        mod foo;
-        mod bar;
-        mod baz {}
-        //- /foo.rs
-        ",
-    )
-    .diagnostics();
-
-    assert_snapshot!(diagnostics, @r###"
-    "mod bar;": unresolved module
-    "###
-    );
-}
-
-#[test]
-fn module_resolution_decl_inside_module_in_non_crate_root_2() {
-    let map = def_map(
-        r###"
-        //- /main.rs
-        #[path="module/m2.rs"]
-        mod module;
-
-        //- /module/m2.rs
-        pub mod submod;
-
-        //- /module/submod.rs
-        pub struct Baz;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮module: t
-        ⋮
-        ⋮crate::module
-        ⋮submod: t
-        ⋮
-        ⋮crate::module::submod
-        ⋮Baz: t v
-    "###);
-}
-
-#[test]
-fn nested_out_of_line_module() {
-    let map = def_map(
-        r###"
-        //- /lib.rs
-        mod a {
-            mod b {
-                mod c;
-            }
-        }
-
-        //- /a/b/c.rs
-        struct X;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-    crate
-    a: t
-    
-    crate::a
-    b: t
-    
-    crate::a::b
-    c: t
-    
-    crate::a::b::c
-    X: t v
-    "###);
-}
-
-#[test]
-fn nested_out_of_line_module_with_path() {
-    let map = def_map(
-        r###"
-        //- /lib.rs
-        mod a {
-            #[path = "d/e"]
-            mod b {
-                mod c;
-            }
-        }
-
-        //- /a/d/e/c.rs
-        struct X;
-        "###,
-    );
-
-    assert_snapshot!(map, @r###"
-    crate
-    a: t
-    
-    crate::a
-    b: t
-    
-    crate::a::b
-    c: t
-    
-    crate::a::b::c
-    X: t v
-    "###);
-}
diff --git a/crates/ra_hir/src/nameres/tests/primitives.rs b/crates/ra_hir/src/nameres/tests/primitives.rs
deleted file mode 100644
index 0e2708658..000000000
--- a/crates/ra_hir/src/nameres/tests/primitives.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use super::*;
-
-#[test]
-fn primitive_reexport() {
-    let map = def_map(
-        "
-        //- /lib.rs
-        mod foo;
-        use foo::int;
-
-        //- /foo.rs
-        pub use i32 as int;
-        ",
-    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮foo: t
-   ⋮int: t
-   ⋮
-   ⋮crate::foo
-   ⋮int: t
-    "###
-    );
-}
-- 
cgit v1.2.3