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

auto merge of #12441 : kud1ing/rust/backticks, r=brson

Browse Source 
Not all of those messages are covered by tests. I am not sure how to trigger them and where to put those tests.

Also some message patterns in the existing tests are not complete.
For example, i find `error: mismatched types: expected "i32" but found "char" (expected i32 but found char)` a bit repetitive, but as i can see there is no test covering that.
This commit is contained in:
bors 2014-02-22 09:11:47 -08:00
commit 87e3b5fe7f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc/middle/ty.rs
View File

@ -3691,15 +3691,15 @@ pub fn type_err_to_str(cx: ctxt, err: &type_err) -> ~str {
}
}
terr_integer_as_char => {
format!("expected an integral type but found char")
format!("expected an integral type but found `char`")
}
terr_int_mismatch(ref values) => {
format!("expected {} but found {}",
format!("expected `{}` but found `{}`",
values.expected.to_str(),
values.found.to_str())
}
terr_float_mismatch(ref values) => {
format!("expected {} but found {}",
format!("expected `{}` but found `{}`",
values.expected.to_str(),
values.found.to_str())
}
@ -3767,13 +3767,13 @@ pub fn provided_trait_methods(cx: ctxt, id: ast::DefId) -> ~[@Method] {
}
_ => {
cx.sess.bug(format!("provided_trait_methods: \
{:?} is not a trait",
`{:?}` is not a trait",
id))
}
}
}
_ => {
cx.sess.bug(format!("provided_trait_methods: {:?} is not \
cx.sess.bug(format!("provided_trait_methods: `{:?}` is not \
a trait",
id))
}

2
src/librustc/middle/typeck/collect.rs
View File

@ -768,7 +768,7 @@ pub fn instantiate_trait_ref(ccx: &CrateCtxt,
_ => {
ccx.tcx.sess.span_fatal(
ast_trait_ref.path.span,
format!("{} is not a trait",
format!("`{}` is not a trait",
path_to_str(&ast_trait_ref.path)));
}
}

2
src/test/compile-fail/issue-2330.rs
View File

@ -15,7 +15,7 @@ trait channel<T> {
}
// `chan` is not a trait, it's an enum
impl chan for int { //~ ERROR chan is not a trait
impl chan for int { //~ ERROR `chan` is not a trait
fn send(&self, v: int) { fail!() }
}

2
src/test/compile-fail/issue-3907.rs
View File

@ -17,7 +17,7 @@ struct S {
name: int
}
impl Foo for S { //~ ERROR: Foo is not a trait
impl Foo for S { //~ ERROR: `Foo` is not a trait
fn bar() { }
}