mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #10509 : cmr/rust/trait_name, r=alexcrichton

Browse Source 
Rebase + fix of #10118
This commit is contained in:
bors 2013-11-17 03:16:37 -08:00
commit dff4f52a72
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/middle/typeck/check/mod.rs
View File

@ -863,10 +863,12 @@ pub fn compare_impl_method(tcx: ty::ctxt,
if impl_m.fty.sig.inputs.len() != trait_m.fty.sig.inputs.len() {
tcx.sess.span_err(
impl_m_span,
format!("method `{}` has {} parameter(s) \
but the trait has {} parameter(s)",
format!("method `{}` has {} parameter{} \
but the declaration in trait `{}` has {}",
tcx.sess.str_of(trait_m.ident),
impl_m.fty.sig.inputs.len(),
if impl_m.fty.sig.inputs.len() == 1 { "" } else { "s" },
ty::item_path_str(tcx, trait_m.def_id),
trait_m.fty.sig.inputs.len()));
return;
}

2
src/test/compile-fail/trait-impl-different-num-params.rs
View File

@ -13,7 +13,7 @@ trait foo {
}
impl foo for int {
fn bar(&self) -> int {
//~^ ERROR method `bar` has 0 parameter(s) but the trait has 1
//~^ ERROR method `bar` has 0 parameters but the declaration in trait `foo::bar` has 1
*self
}
}