about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/comp/metadata/csearch.rs3
-rw-r--r--src/comp/middle/ast_map.rs2
-rw-r--r--src/test/compile-fail/fully-qualified-type-name1.rs7
-rw-r--r--src/test/compile-fail/fully-qualified-type-name2.rs17
4 files changed, 2 insertions, 27 deletions
diff --git a/src/comp/metadata/csearch.rs b/src/comp/metadata/csearch.rs
index 6cd78d0b5c4..1ac86faed0d 100644
--- a/src/comp/metadata/csearch.rs
+++ b/src/comp/metadata/csearch.rs
@@ -60,8 +60,7 @@ fn resolve_path(cstore: cstore::cstore, cnum: ast::crate_num,
 fn get_item_path(tcx: ty::ctxt, def: ast::def_id) -> ast_map::path {
     let cstore = tcx.sess.cstore;
     let cdata = cstore::get_crate_data(cstore, def.crate);
-    let path = decoder::get_item_path(cdata, def.node);
-    [ast_map::path_mod(cdata.name)] + path
+    ret decoder::get_item_path(cdata, def.node);
 }
 
 fn get_enum_variants(tcx: ty::ctxt, def: ast::def_id) -> [ty::variant_info] {
diff --git a/src/comp/middle/ast_map.rs b/src/comp/middle/ast_map.rs
index 01ad8a3df67..1504f5f738e 100644
--- a/src/comp/middle/ast_map.rs
+++ b/src/comp/middle/ast_map.rs
@@ -17,7 +17,7 @@ fn path_to_str_with_sep(p: path, sep: str) -> str {
 }
 
 fn path_to_str(p: path) -> str {
-    "::" + path_to_str_with_sep(p, "::")
+    path_to_str_with_sep(p, "::")
 }
 
 enum ast_node {
diff --git a/src/test/compile-fail/fully-qualified-type-name1.rs b/src/test/compile-fail/fully-qualified-type-name1.rs
deleted file mode 100644
index 9a197de565b..00000000000
--- a/src/test/compile-fail/fully-qualified-type-name1.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test that we use fully-qualified type names in error messages.
-
-fn main() {
-    let x: option<uint>;
-    x = 5;
-    //!^ ERROR mismatched types: expected `::core::option::t<uint>`
-}
diff --git a/src/test/compile-fail/fully-qualified-type-name2.rs b/src/test/compile-fail/fully-qualified-type-name2.rs
deleted file mode 100644
index 4b40875ebd1..00000000000
--- a/src/test/compile-fail/fully-qualified-type-name2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Test that we use fully-qualified type names in error messages.
-
-mod x {
-    enum foo { }
-}
-
-mod y {
-    enum foo { }
-}
-
-fn bar(x: x::foo) -> y::foo {
-    ret x;
-    //!^ ERROR mismatched types: expected `::y::foo` but found `::x::foo`
-}
-
-fn main() {
-}