squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

print type arguments when pretty-printing all nominal types

Browse source
This commit is contained in:
Niko Matsakis 2012-03-02 21:49:39 -08:00
parent 3269a4043c
commit 8820d4485b
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/rustc/util/ppaux.rs
View file

@ -74,7 +74,10 @@ fn ty_to_str(cx: ctxt, typ: t) -> str {
some(def_id) {
let cs = ast_map::path_to_str(ty::item_path(cx, def_id));
ret alt ty::get(typ).struct {
ty_enum(_, tps) | ty_res(_, _, tps) { parameterized(cx, cs, tps) }
ty_enum(_, tps) | ty_res(_, _, tps) | ty_iface(_, tps) |
ty_class(_, tps) {
parameterized(cx, cs, tps)
}
_ { cs }
};
}
@ -94,6 +97,7 @@ fn ty_to_str(cx: ctxt, typ: t) -> str {
ty_float(ast::ty_f) { "float" }
ty_float(t) { ast_util::float_ty_to_str(t) }
ty_str { "str" }
ty_self(ts) { parameterized(cx, "self", ts) }
ty_box(tm) { "@" + mt_to_str(cx, tm) }
ty_uniq(tm) { "~" + mt_to_str(cx, tm) }
ty_ptr(tm) { "*" + mt_to_str(cx, tm) }
@ -117,7 +121,8 @@ fn ty_to_str(cx: ctxt, typ: t) -> str {
ty_param(id, _) {
"'" + str::from_bytes([('a' as u8) + (id as u8)])
}
ty_enum(did, tps) | ty_res(did, _, tps) | ty_class(did, tps) {
ty_enum(did, tps) | ty_res(did, _, tps) | ty_iface(did, tps) |
ty_class(did, tps) {
// Not sure why, but under some circumstances enum or resource types
// do not have an associated id. I didn't investigate enough to know
// if there is a good reason for this. - Niko, 2012-02-10

10
src/test/compile-fail/map-types.rs Normal file
View file

@ -0,0 +1,10 @@
use std;
import std::map;
import std::map::map;
// Test that iface types printed in error msgs include the type arguments.
fn main() {
let x: map<uint,str> = map::new_str_hash::<str>();
//!^ ERROR mismatched types: expected `std::map::map<uint,str>`
}