Merge branch 'master' into feature/themes

1 files changed, 0 insertions, 24 deletions

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
-    "###
-    );
-}