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 index 9a197de565b..1790acffd50 100644 --- a/src/test/compile-fail/fully-qualified-type-name1.rs +++ b/src/test/compile-fail/fully-qualified-type-name1.rs @@ -3,5 +3,5 @@ fn main() { let x: option; x = 5; - //!^ ERROR mismatched types: expected `::core::option::t` + //!^ ERROR mismatched types: expected `core::option::t` } diff --git a/src/test/compile-fail/fully-qualified-type-name2.rs b/src/test/compile-fail/fully-qualified-type-name2.rs index 4b40875ebd1..a9293da2eff 100644 --- a/src/test/compile-fail/fully-qualified-type-name2.rs +++ b/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() { diff --git a/src/test/compile-fail/fully-qualified-type-name3.rs b/src/test/compile-fail/fully-qualified-type-name3.rs new file mode 100644 index 00000000000..411dc2e9e76 --- /dev/null +++ b/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() { +} diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs new file mode 100644 index 00000000000..73941c45498 --- /dev/null +++ b/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() { +}