Revert prior commit until I have time to track down the valgrind error

This reverts commit 2ec3a0b60833736a3c0d805768885b4392c36100.
This commit is contained in:
Niko Matsakis 2012-02-11 09:49:02 -08:00
parent 2ec3a0b608
commit fc023d91c7
4 changed files with 2 additions and 27 deletions

View File

@ -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] {

View File

@ -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 {

View File

@ -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>`
}

View File

@ -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() {
}