---

yaml
---
r: 14066
b: refs/heads/try
c: 966504c
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: daf0d63a59e5abfb32477748e8df4bffe1fbe2e1
+refs/heads/try: 966504c828ded5b6a0a9d4ff5264fb778570005e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/ty.rs

@@ -167,6 +167,7 @@ export type_structurally_contains;
 export type_structurally_contains_uniques;
 export type_autoderef;
 export type_param;
+export canon_mode;
 export resolved_mode;
 export arg_mode;
 export unify_mode;

branches/try/src/comp/util/ppaux.rs

@@ -12,12 +12,19 @@ import middle::ast_map;
 fn ty_to_str(cx: ctxt, typ: t) -> str {
     fn fn_input_to_str(cx: ctxt, input: {mode: ast::mode, ty: t}) ->
        str {
-        let arg_mode = ty::arg_mode(cx, input);
-        let modestr = {
-            if arg_mode == ty::default_arg_mode_for_ty(cx, input.ty) { "" }
-            else { mode_to_str(input.mode) }
+        let {mode, ty} = input;
+        let modestr = alt canon_mode(cx, mode) {
+          ast::infer(_) { "" }
+          ast::expl(m) {
+            if !ty::type_contains_vars(cx, ty) &&
+                m == ty::default_arg_mode_for_ty(cx, ty) {
+                ""
+            } else {
+                mode_to_str(ast::expl(m))
+            }
+          }
         };
-        modestr + ty_to_str(cx, input.ty)
+        modestr + ty_to_str(cx, ty)
     }
     fn fn_to_str(cx: ctxt, proto: ast::proto, ident: option<ast::ident>,
                  inputs: [arg], output: t, cf: ast::ret_style,