---

yaml
---
r: 14206
b: refs/heads/try
c: 2ec3a0b
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d972226567c523c6d81a343f742784b0a5e8d681
+refs/heads/try: 2ec3a0b60833736a3c0d805768885b4392c36100
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/metadata/csearch.rs

@@ -60,7 +60,8 @@ 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);
-    ret decoder::get_item_path(cdata, def.node);
+    let path = decoder::get_item_path(cdata, def.node);
+    [ast_map::path_mod(cdata.name)] + path
 }
 
 fn get_enum_variants(tcx: ty::ctxt, def: ast::def_id) -> [ty::variant_info] {

branches/try/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 {

branches/try/src/test/compile-fail/fully-qualified-type-name1.rs

@@ -0,0 +1,7 @@
+// 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>`
+}

branches/try/src/test/compile-fail/fully-qualified-type-name2.rs

@@ -0,0 +1,17 @@
+// 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() {
+}