---

yaml
---
r: 11259
b: refs/heads/master
c: a7641e9
h: refs/heads/master
i:
  11257: 07ff1d8
  11255: 24a28aa
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bcbe36b33b7d310d64abeb76231cd3bd8b5cd584
+refs/heads/master: a7641e99e8e6830e4242cfe441a867eb6e955694
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/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 {

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

@@ -3,5 +3,5 @@
 fn main() {
     let x: option<uint>;
     x = 5;
-    //!^ ERROR mismatched types: expected `::core::option::t<uint>`
+    //!^ ERROR mismatched types: expected `core::option::t<uint>`
 }

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

@@ -10,7 +10,7 @@ mod y {
 
 fn bar(x: x::foo) -> y::foo {
     ret x;
-    //!^ ERROR mismatched types: expected `::y::foo` but found `::x::foo`
+    //!^ ERROR mismatched types: expected `y::foo` but found `x::foo`
 }
 
 fn main() {

trunk/src/test/compile-fail/fully-qualified-type-name3.rs

@@ -0,0 +1,12 @@
+// Test that we use fully-qualified type names in error messages.
+
+type T1 = uint;
+type T2 = int;
+
+fn bar(x: T1) -> T2 {
+    ret x;
+    //!^ ERROR mismatched types: expected `T2` but found `T1`
+}
+
+fn main() {
+}

trunk/src/test/compile-fail/fully-qualified-type-name4.rs

@@ -0,0 +1,11 @@
+// Test that we use fully-qualified type names in error messages.
+
+import core::task::task;
+
+fn bar(x: uint) -> task {
+    ret x;
+    //!^ ERROR mismatched types: expected `core::task::task`
+}
+
+fn main() {
+}