Skip to content

Commit 830d231

Browse files
committed
---
yaml --- r: 14268 b: refs/heads/try c: 520c3f5 h: refs/heads/master v: v3
1 parent eaeb69a commit 830d231

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
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: 3a2f1e1876061ccf7eeffe7f4adba0874c7a98ae
5+
refs/heads/try: 520c3f5f798f65b7b26fe9c7f6409ef2f3cf6984
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ fn compare_impl_method(tcx: ty::ctxt, sp: span, impl_m: ty::method,
621621
"` has an incompatible set of type parameters");
622622
ty::mk_fn(tcx, impl_m.fty)
623623
} else if vec::len(impl_m.fty.inputs) != vec::len(if_m.fty.inputs) {
624-
tcx.sess.span_err(sp,#fmt["method `%s`` has %u parameters \
624+
tcx.sess.span_err(sp,#fmt["method `%s` has %u parameters \
625625
but the iface has %u",
626626
if_m.ident,
627627
vec::len(impl_m.fty.inputs),

branches/try/src/test/compile-fail/iface-impl-different-num-params.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ iface foo {
33
}
44
impl of foo for int {
55
fn bar() -> int {
6+
//!^ ERROR method `bar` has 0 parameters but the iface has 1
67
self
78
}
89
}

0 commit comments

Comments
 (0)