Skip to content

Commit a616034

Browse files
committed
---
yaml --- r: 15763 b: refs/heads/try c: 0e43e8c h: refs/heads/master i: 15761: 44a5f9d 15759: 49da4b8 v: v3
1 parent 89bb69a commit a616034

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 1e6da7b38dfac0ce0c59d966f242ca57a7dc9bf9
5+
refs/heads/try: 0e43e8ccc8e67dbccbfdbc0c8300a41e43d8b0cf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/kind.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import syntax::codemap::span;
44
import ty::{kind, kind_copyable, kind_sendable, kind_noncopyable};
55
import driver::session::session;
66
import std::map::hashmap;
7+
import util::ppaux::{ty_to_str, tys_to_str};
78
import syntax::print::pprust::expr_to_str;
89
import freevars::freevar_entry;
910

@@ -267,8 +268,8 @@ fn check_expr(e: @expr, cx: ctx, v: visit::vt<ctx>) {
267268
// Fail earlier to make debugging easier
268269
fail #fmt("Internal error: in kind::check_expr, length \
269270
mismatch between actual and declared bounds: actual = \
270-
%s (%u tys), declared = %s (%u tys)", ts, ts.len(),
271-
*bounds, bounds.len());
271+
%s (%u tys), declared = %? (%u tys)",
272+
tys_to_str(cx.tcx, ts), ts.len(), *bounds, (*bounds).len());
272273
}
273274
vec::iter2(ts, *bounds) {|ty, bound|
274275
check_bounds(cx, e.span, ty, bound)

0 commit comments

Comments
 (0)