OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #16699 : treeman/rust/issue-8492, r=alexcrichton

Browse Source 
Closes #8492.

I did not find this suggestion in the [guidelines][] but it's mentioned in the [old style guide][].

[guidelines]: https://github.com/rust-lang/rust-guidelines
[old style guide]: 73c864a10a
This commit is contained in:
bors 2014-08-25 03:30:54 +00:00
commit 0b3e43d2a4
118 changed files with 266 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libfmt_macros/lib.rs
View File

@ -200,7 +200,7 @@ impl<'a> Parser<'a> {
self.cur.next();
}
Some((_, other)) => {
self.err(format!("expected `{}` but found `{}`",
self.err(format!("expected `{}`, found `{}`",
c,
other).as_slice());
}

4
src/librustc/metadata/tydecode.rs
View File

@ -575,12 +575,12 @@ pub fn parse_def_id(buf: &[u8]) -> ast::DefId {
let crate_num = match uint::parse_bytes(crate_part, 10u) {
Some(cn) => cn as ast::CrateNum,
None => fail!("internal error: parse_def_id: crate number expected, but found {:?}",
None => fail!("internal error: parse_def_id: crate number expected, found {:?}",
crate_part)
};
let def_num = match uint::parse_bytes(def_part, 10u) {
Some(dn) => dn as ast::NodeId,
None => fail!("internal error: parse_def_id: id expected, but found {:?}",
None => fail!("internal error: parse_def_id: id expected, found {:?}",
def_part)
};
ast::DefId { krate: crate_num, node: def_num }

2
src/librustc/middle/effect.rs
View File

@ -122,7 +122,7 @@ impl<'a> Visitor<()> for EffectCheckVisitor<'a> {
// we need to create a new context, when we're
// - outside `unsafe` and found a `unsafe` block
// (normal case)
// - inside `unsafe` but found an `unsafe` block
// - inside `unsafe`, found an `unsafe` block
// created internally to the compiler
//
// The second case is necessary to ensure that the

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

@ -3603,17 +3603,17 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String {
match *err {
terr_mismatch => "types differ".to_string(),
terr_fn_style_mismatch(values) => {
format!("expected {} fn but found {} fn",
format!("expected {} fn, found {} fn",
values.expected.to_string(),
values.found.to_string())
}
terr_abi_mismatch(values) => {
format!("expected {} fn but found {} fn",
format!("expected {} fn, found {} fn",
values.expected.to_string(),
values.found.to_string())
}
terr_onceness_mismatch(values) => {
format!("expected {} fn but found {} fn",
format!("expected {} fn, found {} fn",
values.expected.to_string(),
values.found.to_string())
}
@ -3630,20 +3630,20 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String {
terr_ptr_mutability => "pointers differ in mutability".to_string(),
terr_ref_mutability => "references differ in mutability".to_string(),
terr_ty_param_size(values) => {
format!("expected a type with {} type params \
but found one with {} type params",
format!("expected a type with {} type params, \
found one with {} type params",
values.expected,
values.found)
}
terr_tuple_size(values) => {
format!("expected a tuple with {} elements \
but found one with {} elements",
format!("expected a tuple with {} elements, \
found one with {} elements",
values.expected,
values.found)
}
terr_record_size(values) => {
format!("expected a record with {} fields \
but found one with {} fields",
format!("expected a record with {} fields, \
found one with {} fields",
values.expected,
values.found)
}
@ -3651,7 +3651,7 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String {
"record elements differ in mutability".to_string()
}
terr_record_fields(values) => {
format!("expected a record with field `{}` but found one \
format!("expected a record with field `{}`, found one \
with field `{}`",
token::get_ident(values.expected),
token::get_ident(values.found))
@ -3670,57 +3670,57 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String {
}
terr_regions_insufficiently_polymorphic(br, _) => {
format!("expected bound lifetime parameter {}, \
but found concrete lifetime",
found concrete lifetime",
bound_region_ptr_to_string(cx, br))
}
terr_regions_overly_polymorphic(br, _) => {
format!("expected concrete lifetime, \
but found bound lifetime parameter {}",
found bound lifetime parameter {}",
bound_region_ptr_to_string(cx, br))
}
terr_trait_stores_differ(_, ref values) => {
format!("trait storage differs: expected `{}` but found `{}`",
format!("trait storage differs: expected `{}`, found `{}`",
trait_store_to_string(cx, (*values).expected),
trait_store_to_string(cx, (*values).found))
}
terr_sorts(values) => {
format!("expected {} but found {}",
format!("expected {}, found {}",
ty_sort_string(cx, values.expected),
ty_sort_string(cx, values.found))
}
terr_traits(values) => {
format!("expected trait `{}` but found trait `{}`",
format!("expected trait `{}`, found trait `{}`",
item_path_str(cx, values.expected),
item_path_str(cx, values.found))
}
terr_builtin_bounds(values) => {
if values.expected.is_empty() {
format!("expected no bounds but found `{}`",
format!("expected no bounds, found `{}`",
values.found.user_string(cx))
} else if values.found.is_empty() {
format!("expected bounds `{}` but found no bounds",
format!("expected bounds `{}`, found no bounds",
values.expected.user_string(cx))
} else {
format!("expected bounds `{}` but found bounds `{}`",
format!("expected bounds `{}`, found bounds `{}`",
values.expected.user_string(cx),
values.found.user_string(cx))
}
}
terr_integer_as_char => {
"expected an integral type but found `char`".to_string()
"expected an integral type, found `char`".to_string()
}
terr_int_mismatch(ref values) => {
format!("expected `{}` but found `{}`",
format!("expected `{}`, found `{}`",
values.expected.to_string(),
values.found.to_string())
}
terr_float_mismatch(ref values) => {
format!("expected `{}` but found `{}`",
format!("expected `{}`, found `{}`",
values.expected.to_string(),
values.found.to_string())
}
terr_variadic_mismatch(ref values) => {
format!("expected {} fn but found {} function",
format!("expected {} fn, found {} function",
if values.expected { "variadic" } else { "non-variadic" },
if values.found { "variadic" } else { "non-variadic" })
}
@ -4548,7 +4548,7 @@ pub fn eval_repeat_count<T: ExprTyProvider>(tcx: &T, count_expr: &ast::Expr) ->
const_eval::const_int(count) => if count < 0 {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found negative integer");
repeat count, found negative integer");
return 0;
} else {
return count as uint
@ -4557,38 +4557,38 @@ pub fn eval_repeat_count<T: ExprTyProvider>(tcx: &T, count_expr: &ast::Expr) ->
const_eval::const_float(count) => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found float");
repeat count, found float");
return count as uint;
}
const_eval::const_str(_) => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found string");
repeat count, found string");
return 0;
}
const_eval::const_bool(_) => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found boolean");
repeat count, found boolean");
return 0;
}
const_eval::const_binary(_) => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found binary array");
repeat count, found binary array");
return 0;
}
const_eval::const_nil => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected positive integer for \
repeat count but found ()");
repeat count, found ()");
return 0;
}
},
Err(..) => {
tcx.ty_ctxt().sess.span_err(count_expr.span,
"expected constant integer for repeat count \
but found variable");
"expected constant integer for repeat count, \
found variable");
return 0;
}
}

6
src/librustc/middle/typeck/astconv.rs
View File

@ -191,7 +191,7 @@ fn ast_path_substs<AC:AstConv,RS:RegionScope>(
if supplied_num_region_params != 0 || anon_regions.is_err() {
span_err!(tcx.sess, path.span, E0107,
"wrong number of lifetime parameters: expected {} but found {}",
"wrong number of lifetime parameters: expected {}, found {}",
expected_num_region_params, supplied_num_region_params);
}
@ -216,7 +216,7 @@ fn ast_path_substs<AC:AstConv,RS:RegionScope>(
"expected"
};
this.tcx().sess.span_fatal(path.span,
format!("wrong number of type arguments: {} {} but found {}",
format!("wrong number of type arguments: {} {}, found {}",
expected,
required_ty_param_count,
supplied_ty_param_count).as_slice());
@ -227,7 +227,7 @@ fn ast_path_substs<AC:AstConv,RS:RegionScope>(
"expected"
};
this.tcx().sess.span_fatal(path.span,
format!("wrong number of type arguments: {} {} but found {}",
format!("wrong number of type arguments: {} {}, found {}",
expected,
formal_ty_param_count,
supplied_ty_param_count).as_slice());

16
src/librustc/middle/typeck/check/_match.rs
View File

@ -169,7 +169,7 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: &ast::Pat, path: &ast::Path,
fcx.infcx().type_error_message_str_with_expected(pat.span,
|expected, actual| {
expected.map_or("".to_string(), |e| {
format!("mismatched types: expected `{}` but found {}",
format!("mismatched types: expected `{}`, found {}",
e, actual)
})},
Some(expected),
@ -223,7 +223,7 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: &ast::Pat, path: &ast::Path,
|expected, actual| {
expected.map_or("".to_string(),
|e| {
format!("mismatched types: expected `{}` but found {}",
format!("mismatched types: expected `{}`, found {}",
e, actual)
})
},
@ -395,7 +395,7 @@ pub fn check_struct_like_enum_variant_pat(pcx: &pat_ctxt,
Some(&def::DefTy(..)) => {
let name = pprust::path_to_string(path);
span_err!(tcx.sess, span, E0028,
"mismatched types: expected `{}` but found `{}`",
"mismatched types: expected `{}`, found `{}`",
fcx.infcx().ty_to_string(expected), name);
}
_ => {
@ -548,7 +548,7 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
expected.map_or("".to_string(),
|e| {
format!("mismatched types: expected \
`{}` but found {}", e, actual)
`{}`, found {}", e, actual)
})},
Some(expected),
"a structure pattern".to_string(),
@ -607,8 +607,8 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
|expected,
actual| {
expected.map_or("".to_string(), |e| {
format!("mismatched types: expected `{}` \
but found {}", e, actual)
format!("mismatched types: expected `{}`, \
found {}", e, actual)
}
)},
Some(expected),
@ -645,7 +645,7 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
|expected, actual| {
expected.map_or("".to_string(),
|e| {
format!("mismatched types: expected `{}` but found {}",
format!("mismatched types: expected `{}`, found {}",
e, actual)
})
},
@ -763,7 +763,7 @@ fn check_pointer_pat(pcx: &pat_ctxt,
span,
|expected, actual| {
expected.map_or("".to_string(), |e| {
format!("mismatched types: expected `{}` but found {}",
format!("mismatched types: expected `{}`, found {}",
e, actual)
})
},

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

@ -2313,7 +2313,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
ty::ty_closure(box ty::ClosureTy {sig: ref sig, ..}) => sig,
_ => {
fcx.type_error_message(call_expr.span, |actual| {
format!("expected function but found `{}`", actual)
format!("expected function, found `{}`", actual)
}, fn_ty, None);
&error_fn_sig
}
@ -3811,7 +3811,7 @@ impl Repr for Expectation {
pub fn require_uint(fcx: &FnCtxt, sp: Span, t: ty::t) {
if !type_is_uint(fcx, sp, t) {
fcx.type_error_message(sp, |actual| {
format!("mismatched types: expected `uint` type but found `{}`",
format!("mismatched types: expected `uint` type, found `{}`",
actual)
}, t, None);
}
@ -3820,7 +3820,7 @@ pub fn require_uint(fcx: &FnCtxt, sp: Span, t: ty::t) {
pub fn require_integral(fcx: &FnCtxt, sp: Span, t: ty::t) {
if !type_is_integral(fcx, sp, t) {
fcx.type_error_message(sp, |actual| {
format!("mismatched types: expected integral type but found `{}`",
format!("mismatched types: expected integral type, found `{}`",
actual)
}, t, None);
}
@ -4336,28 +4336,28 @@ pub fn polytype_for_def(fcx: &FnCtxt,
def::DefTy(_) |
def::DefPrimTy(_) |
def::DefTyParam(..)=> {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found type");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found type");
}
def::DefMod(..) | def::DefForeignMod(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found module");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found module");
}
def::DefUse(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found use");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found use");
}
def::DefRegion(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found region");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found region");
}
def::DefTyParamBinder(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found type parameter");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found type parameter");
}
def::DefLabel(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found label");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found label");
}
def::DefSelfTy(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found self ty");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found self ty");
}
def::DefMethod(..) => {
fcx.ccx.tcx.sess.span_bug(sp, "expected value but found method");
fcx.ccx.tcx.sess.span_bug(sp, "expected value, found method");
}
}
}
@ -4585,8 +4585,8 @@ pub fn instantiate_path(fcx: &FnCtxt,
} else if i == type_count {
span_err!(fcx.tcx().sess, typ.span, E0087,
"too many type parameters provided: \
expected at most {} parameter(s) \
but found {} parameter(s)",
expected at most {} parameter(s), \
found {} parameter(s)",
type_count, segment.types.len());
substs.types.truncate(space, 0);
}
@ -4603,7 +4603,7 @@ pub fn instantiate_path(fcx: &FnCtxt,
} else if i == region_count {
span_err!(fcx.tcx().sess, lifetime.span, E0088,
"too many lifetime parameters provided: \
expected {} parameter(s) but found {} parameter(s)",
expected {} parameter(s), found {} parameter(s)",
region_count,
segment.lifetimes.len());
substs.mut_regions().truncate(space, 0);
@ -4652,7 +4652,7 @@ pub fn instantiate_path(fcx: &FnCtxt,
if desired.len() != required_len { "at least " } else { "" };
span_err!(fcx.tcx().sess, span, E0089,
"too few type parameters provided: expected {}{} parameter(s) \
but found {} parameter(s)",
, found {} parameter(s)",
qualifier, required_len, provided_len);
substs.types.replace(space,
Vec::from_elem(desired.len(), ty::mk_err()));
@ -4705,8 +4705,8 @@ pub fn instantiate_path(fcx: &FnCtxt,
// Otherwise, too few were provided. Report an error and then
// use inference variables.
span_err!(fcx.tcx().sess, span, E0090,
"too few lifetime parameters provided: expected {} parameter(s) \
but found {} parameter(s)",
"too few lifetime parameters provided: expected {} parameter(s), \
found {} parameter(s)",
desired.len(), provided_len);
substs.mut_regions().replace(

2
src/librustc/middle/typeck/check/vtable.rs
View File

@ -206,7 +206,7 @@ fn relate_trait_refs(vcx: &VtableContext,
!ty::trait_ref_contains_error(&r_exp_trait_ref)
{
let tcx = vcx.tcx();
span_err!(tcx.sess, span, E0095, "expected {}, but found {} ({})",
span_err!(tcx.sess, span, E0095, "expected {}, found {} ({})",
ppaux::trait_ref_to_string(tcx, &r_exp_trait_ref),
ppaux::trait_ref_to_string(tcx, &r_act_trait_ref),
ty::type_err_to_str(tcx, err));

4
src/librustc/middle/typeck/infer/error_reporting.rs
View File

@ -377,7 +377,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> {
fn values_str(&self, values: &ValuePairs) -> Option<String> {
/*!
* Returns a string of the form "expected `{}` but found `{}`",
* Returns a string of the form "expected `{}`, found `{}`",
* or None if this is a derived error.
*/
match *values {
@ -405,7 +405,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> {
return None;
}
Some(format!("expected `{}` but found `{}`",
Some(format!("expected `{}`, found `{}`",
expected.user_string(self.tcx),
found.user_string(self.tcx)))
}

2
src/librustc/middle/typeck/infer/mod.rs
View File

@ -799,7 +799,7 @@ impl<'a> InferCtxt<'a> {
_ => {
// if I leave out : String, it infers &str and complains
|actual: String| {
format!("mismatched types: expected `{}` but found `{}`",
format!("mismatched types: expected `{}`, found `{}`",
self.ty_to_string(resolved_expected),
actual)
}

2
src/libsyntax/ext/asm.rs
View File

@ -151,7 +151,7 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
clobs.push(clob);
if OPTIONS.iter().any(|opt| s.equiv(opt)) {
cx.span_warn(p.last_span, "expected a clobber, but found an option");
cx.span_warn(p.last_span, "expected a clobber, found an option");
}
}

2
src/libsyntax/ext/format.rs
View File

@ -128,7 +128,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, allow_method: bool,
}
_ => {
ecx.span_err(p.span,
format!("expected ident for named argument, but found `{}`",
format!("expected ident for named argument, found `{}`",
p.this_token_to_string()).as_slice());
return (invocation, None);
}

2
src/libsyntax/parse/attr.rs
View File

@ -92,7 +92,7 @@ impl<'a> ParserAttr for Parser<'a> {
}
_ => {
let token_str = self.this_token_to_string();
self.fatal(format!("expected `#` but found `{}`",
self.fatal(format!("expected `#`, found `{}`",
token_str).as_slice());
}
};

20
src/libsyntax/parse/parser.rs
View File

@ -414,7 +414,7 @@ impl<'a> Parser<'a> {
} else {
let token_str = Parser::token_to_string(t);
let this_token_str = self.this_token_to_string();
self.fatal(format!("expected `{}` but found `{}`",
self.fatal(format!("expected `{}`, found `{}`",
token_str,
this_token_str).as_slice())
}
@ -448,11 +448,11 @@ impl<'a> Parser<'a> {
let actual = self.this_token_to_string();
self.fatal(
(if expected.len() != 1 {
(format!("expected one of `{}` but found `{}`",
(format!("expected one of `{}`, found `{}`",
expect,
actual))
} else {
(format!("expected `{}` but found `{}`",
(format!("expected `{}`, found `{}`",
expect,
actual))
}).as_slice()
@ -1321,7 +1321,7 @@ impl<'a> Parser<'a> {
_ => {
let token_str = p.this_token_to_string();
p.fatal((format!("expected `;` or `{{` but found `{}`",
p.fatal((format!("expected `;` or `{{`, found `{}`",
token_str)).as_slice())
}
}
@ -3382,7 +3382,7 @@ impl<'a> Parser<'a> {
""
};
let tok_str = self.this_token_to_string();
self.fatal(format!("expected {}`(` or `{{`, but found `{}`",
self.fatal(format!("expected {}`(` or `{{`, found `{}`",
ident_str,
tok_str).as_slice())
}
@ -3931,7 +3931,7 @@ impl<'a> Parser<'a> {
},
_ => {
let token_str = self.this_token_to_string();
self.fatal(format!("expected `self` but found `{}`",
self.fatal(format!("expected `self`, found `{}`",
token_str).as_slice())
}
}
@ -4462,7 +4462,7 @@ impl<'a> Parser<'a> {
} else {
let token_str = self.this_token_to_string();
self.fatal(format!("expected `{}`, `(`, or `;` after struct \
name but found `{}`", "{",
name, found `{}`", "{",
token_str).as_slice())
}
@ -4493,7 +4493,7 @@ impl<'a> Parser<'a> {
let span = self.span;
let token_str = self.this_token_to_string();
self.span_fatal(span,
format!("expected `,`, or `}}` but found `{}`",
format!("expected `,`, or `}}`, found `{}`",
token_str).as_slice())
}
}
@ -4573,7 +4573,7 @@ impl<'a> Parser<'a> {
}
_ => {
let token_str = self.this_token_to_string();
self.fatal(format!("expected item but found `{}`",
self.fatal(format!("expected item, found `{}`",
token_str).as_slice())
}
}
@ -5114,7 +5114,7 @@ impl<'a> Parser<'a> {
let span = self.span;
let token_str = self.this_token_to_string();
self.span_fatal(span,
format!("expected `{}` or `fn` but found `{}`", "{",
format!("expected `{}` or `fn`, found `{}`", "{",
token_str).as_slice());
}

2
src/libterm/terminfo/parser/compiled.rs
View File

@ -184,7 +184,7 @@ pub fn parse(file: &mut io::Reader, longnames: bool)
// Check magic number
let magic = try!(file.read_le_u16());
if magic != 0x011A {
return Err(format!("invalid magic number: expected {:x} but found {:x}",
return Err(format!("invalid magic number: expected {:x}, found {:x}",
0x011Au, magic as uint));
}

2
src/test/compile-fail/asm-misplaced-option.rs
View File

@ -29,7 +29,7 @@ pub fn main() {
unsafe {
// comma in place of a colon
asm!("add $2, $1; mov $1, $0" : "=r"(x) : "r"(x), "r"(8u) : "cc", "volatile");
//~^ WARNING expected a clobber, but found an option
//~^ WARNING expected a clobber, found an option
}
assert_eq!(x, 13);
}

2
src/test/compile-fail/bad-bang-ann-3.rs
View File

@ -12,7 +12,7 @@
fn bad_bang(i: uint) -> ! {
return 7u;
//~^ ERROR expected `!` but found `uint`
//~^ ERROR expected `!`, found `uint`
}
fn main() { bad_bang(5u); }

2
src/test/compile-fail/bad-bang-ann.rs
View File

@ -12,7 +12,7 @@
fn bad_bang(i: uint) -> ! {
if i < 0u { } else { fail!(); }
//~^ ERROR expected `!` but found `()`
//~^ ERROR expected `!`, found `()`
}
fn main() { bad_bang(5u); }

2
src/test/compile-fail/bad-const-type.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:expected `collections::string::String` but found `int`
// error-pattern:expected `collections::string::String`, found `int`
static i: String = 10i;
fn main() { println!("{}", i); }

2
src/test/compile-fail/bang-tailexpr.rs
View File

@ -9,6 +9,6 @@
// except according to those terms.
fn f() -> ! {
3i //~ ERROR expected `!` but found `int`
3i //~ ERROR expected `!`, found `int`
}
fn main() { }

2
src/test/compile-fail/block-must-not-have-result-do.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:mismatched types: expected `()` but found `bool`
// error-pattern:mismatched types: expected `()`, found `bool`
fn main() {
loop {

2
src/test/compile-fail/block-must-not-have-result-res.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:mismatched types: expected `()` but found `bool`
// error-pattern:mismatched types: expected `()`, found `bool`
struct r;

2
src/test/compile-fail/block-must-not-have-result-while.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:mismatched types: expected `()` but found `bool`
// error-pattern:mismatched types: expected `()`, found `bool`
fn main() {
while true {

2
src/test/compile-fail/closure-bounds-subtype.rs
View File

@ -21,7 +21,7 @@ fn give_any(f: ||:) {
fn give_owned(f: ||:Send) {
take_any(f);
take_const_owned(f); //~ ERROR expected bounds `Send+Sync` but found bounds `Send`
take_const_owned(f); //~ ERROR expected bounds `Send+Sync`, found bounds `Send`
}
fn main() {}

2
src/test/compile-fail/column-offset-1-based.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
# //~ ERROR 11:1: 11:2 error: expected `[` but found `<eof>`
# //~ ERROR 11:1: 11:2 error: expected `[`, found `<eof>`

2
src/test/compile-fail/empty-impl-semicolon.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
impl Foo; //~ ERROR expected `{` but found `;`
impl Foo; //~ ERROR expected `{`, found `;`

8
src/test/compile-fail/explicit-self-lifetime-mismatch.rs
View File

@ -16,10 +16,10 @@ struct Foo<'a,'b> {
impl<'a,'b> Foo<'a,'b> {
// The number of errors is related to the way invariance works.
fn bar(self: Foo<'b,'a>) {}
//~^ ERROR mismatched types: expected `Foo<'a,'b>` but found `Foo<'b,'a>`
//~^^ ERROR mismatched types: expected `Foo<'a,'b>` but found `Foo<'b,'a>`
//~^^^ ERROR mismatched types: expected `Foo<'b,'a>` but found `Foo<'a,'b>`
//~^^^^ ERROR mismatched types: expected `Foo<'b,'a>` but found `Foo<'a,'b>`
//~^ ERROR mismatched types: expected `Foo<'a,'b>`, found `Foo<'b,'a>`
//~^^ ERROR mismatched types: expected `Foo<'a,'b>`, found `Foo<'b,'a>`
//~^^^ ERROR mismatched types: expected `Foo<'b,'a>`, found `Foo<'a,'b>`
//~^^^^ ERROR mismatched types: expected `Foo<'b,'a>`, found `Foo<'a,'b>`
}
fn main() {}

2
src/test/compile-fail/extern-expected-fn-or-brace.rs
View File

@ -11,4 +11,4 @@
// Verifies that the expected token errors for `extern crate` are
// raised
extern "C" mod foo; //~ERROR expected `{` or `fn` but found `mod`
extern "C" mod foo; //~ERROR expected `{` or `fn`, found `mod`

2
src/test/compile-fail/extern-foreign-crate.rs
View File

@ -11,4 +11,4 @@
// Verifies that the expected token errors for `extern crate` are
// raised
extern crate foo {} //~ERROR expected one of `=`, `;` but found `{`
extern crate foo {} //~ERROR expected one of `=`, `;`, found `{`

2
src/test/compile-fail/fully-qualified-type-name2.rs
View File

@ -20,7 +20,7 @@ mod y {
fn bar(x: x::foo) -> y::foo {
return x;
//~^ ERROR mismatched types: expected `y::foo` but found `x::foo`
//~^ ERROR mismatched types: expected `y::foo`, found `x::foo`
}
fn main() {

2
src/test/compile-fail/fully-qualified-type-name3.rs
View File

@ -17,7 +17,7 @@ type T2 = int;
fn bar(x: T1) -> T2 {
return x;
//~^ ERROR mismatched types: expected `T2` but found `T1`
//~^ ERROR mismatched types: expected `T2`, found `T1`
}
fn main() {

2
src/test/compile-fail/generic-type-less-params-with-defaults.rs
View File

@ -15,5 +15,5 @@ struct Heap;
struct Vec<T, A = Heap>;
fn main() {
let _: Vec; //~ ERROR wrong number of type arguments: expected at least 1 but found 0
let _: Vec; //~ ERROR wrong number of type arguments: expected at least 1, found 0
}

2
src/test/compile-fail/generic-type-more-params-with-defaults.rs
View File

@ -16,5 +16,5 @@ struct Vec<T, A = Heap>;
fn main() {
let _: Vec<int, Heap, bool>;
//~^ ERROR wrong number of type arguments: expected at most 2 but found 3
//~^ ERROR wrong number of type arguments: expected at most 2, found 3
}

12
src/test/compile-fail/generic-type-params-name-repr.rs
View File

@ -21,23 +21,23 @@ struct HashMap<K, V, H = Hash<K>>;
fn main() {
// Ensure that the printed type doesn't include the default type params...
let _: Foo<int> = ();
//~^ ERROR mismatched types: expected `Foo<int>` but found `()`
//~^ ERROR mismatched types: expected `Foo<int>`, found `()`
// ...even when they're present, but the same types as the defaults.
let _: Foo<int, B, C> = ();
//~^ ERROR mismatched types: expected `Foo<int>` but found `()`
//~^ ERROR mismatched types: expected `Foo<int>`, found `()`
// Including cases where the default is using previous type params.
let _: HashMap<String, int> = ();
//~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>` but found `()`
//~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>`, found `()`
let _: HashMap<String, int, Hash<String>> = ();
//~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>` but found `()`
//~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>`, found `()`
// But not when there's a different type in between.
let _: Foo<A, int, C> = ();
//~^ ERROR mismatched types: expected `Foo<A,int>` but found `()`
//~^ ERROR mismatched types: expected `Foo<A,int>`, found `()`
// And don't print <> at all when there's just defaults.
let _: Foo<A, B, C> = ();
//~^ ERROR mismatched types: expected `Foo` but found `()`
//~^ ERROR mismatched types: expected `Foo`, found `()`
}

2
src/test/compile-fail/if-branch-types.rs
View File

@ -10,5 +10,5 @@
fn main() {
let x = if true { 10i } else { 10u };
//~^ ERROR if and else have incompatible types: expected `int` but found `uint`
//~^ ERROR if and else have incompatible types: expected `int`, found `uint`
}

2
src/test/compile-fail/if-without-else-result.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:mismatched types: expected `()` but found `bool`
// error-pattern:mismatched types: expected `()`, found `bool`
extern crate debug;

2
src/test/compile-fail/inherit-struct4.rs
View File

@ -12,7 +12,7 @@
#![feature(struct_inherit)]
// With lifetime parameters.
struct S5<'a> : S4 { //~ ERROR wrong number of lifetime parameters: expected 1 but found 0
struct S5<'a> : S4 { //~ ERROR wrong number of lifetime parameters: expected 1, found 0
f4: int,
}

72
src/test/compile-fail/integer-literal-suffix-inference.rs
View File

@ -39,62 +39,62 @@ fn main() {
fn id_u64(n: u64) -> u64 { n }
id_i8(a8); // ok
id_i8(a16); //~ ERROR mismatched types: expected `i8` but found `i16`
id_i8(a32); //~ ERROR mismatched types: expected `i8` but found `i32`
id_i8(a64); //~ ERROR mismatched types: expected `i8` but found `i64`
id_i8(a16); //~ ERROR mismatched types: expected `i8`, found `i16`
id_i8(a32); //~ ERROR mismatched types: expected `i8`, found `i32`
id_i8(a64); //~ ERROR mismatched types: expected `i8`, found `i64`
id_i16(a8); //~ ERROR mismatched types: expected `i16` but found `i8`
id_i16(a8); //~ ERROR mismatched types: expected `i16`, found `i8`
id_i16(a16); // ok
id_i16(a32); //~ ERROR mismatched types: expected `i16` but found `i32`
id_i16(a64); //~ ERROR mismatched types: expected `i16` but found `i64`
id_i16(a32); //~ ERROR mismatched types: expected `i16`, found `i32`
id_i16(a64); //~ ERROR mismatched types: expected `i16`, found `i64`
id_i32(a8); //~ ERROR mismatched types: expected `i32` but found `i8`
id_i32(a16); //~ ERROR mismatched types: expected `i32` but found `i16`
id_i32(a8); //~ ERROR mismatched types: expected `i32`, found `i8`
id_i32(a16); //~ ERROR mismatched types: expected `i32`, found `i16`
id_i32(a32); // ok
id_i32(a64); //~ ERROR mismatched types: expected `i32` but found `i64`
id_i32(a64); //~ ERROR mismatched types: expected `i32`, found `i64`
id_i64(a8); //~ ERROR mismatched types: expected `i64` but found `i8`
id_i64(a16); //~ ERROR mismatched types: expected `i64` but found `i16`
id_i64(a32); //~ ERROR mismatched types: expected `i64` but found `i32`
id_i64(a8); //~ ERROR mismatched types: expected `i64`, found `i8`
id_i64(a16); //~ ERROR mismatched types: expected `i64`, found `i16`
id_i64(a32); //~ ERROR mismatched types: expected `i64`, found `i32`
id_i64(a64); // ok
id_i8(c8); // ok
id_i8(c16); //~ ERROR mismatched types: expected `i8` but found `i16`
id_i8(c32); //~ ERROR mismatched types: expected `i8` but found `i32`
id_i8(c64); //~ ERROR mismatched types: expected `i8` but found `i64`
id_i8(c16); //~ ERROR mismatched types: expected `i8`, found `i16`
id_i8(c32); //~ ERROR mismatched types: expected `i8`, found `i32`
id_i8(c64); //~ ERROR mismatched types: expected `i8`, found `i64`
id_i16(c8); //~ ERROR mismatched types: expected `i16` but found `i8`
id_i16(c8); //~ ERROR mismatched types: expected `i16`, found `i8`
id_i16(c16); // ok
id_i16(c32); //~ ERROR mismatched types: expected `i16` but found `i32`
id_i16(c64); //~ ERROR mismatched types: expected `i16` but found `i64`
id_i16(c32); //~ ERROR mismatched types: expected `i16`, found `i32`
id_i16(c64); //~ ERROR mismatched types: expected `i16`, found `i64`
id_i32(c8); //~ ERROR mismatched types: expected `i32` but found `i8`
id_i32(c16); //~ ERROR mismatched types: expected `i32` but found `i16`
id_i32(c8); //~ ERROR mismatched types: expected `i32`, found `i8`
id_i32(c16); //~ ERROR mismatched types: expected `i32`, found `i16`
id_i32(c32); // ok
id_i32(c64); //~ ERROR mismatched types: expected `i32` but found `i64`
id_i32(c64); //~ ERROR mismatched types: expected `i32`, found `i64`
id_i64(a8); //~ ERROR mismatched types: expected `i64` but found `i8`
id_i64(a16); //~ ERROR mismatched types: expected `i64` but found `i16`
id_i64(a32); //~ ERROR mismatched types: expected `i64` but found `i32`
id_i64(a8); //~ ERROR mismatched types: expected `i64`, found `i8`
id_i64(a16); //~ ERROR mismatched types: expected `i64`, found `i16`
id_i64(a32); //~ ERROR mismatched types: expected `i64`, found `i32`
id_i64(a64); // ok
id_u8(b8); // ok
id_u8(b16); //~ ERROR mismatched types: expected `u8` but found `u16`
id_u8(b32); //~ ERROR mismatched types: expected `u8` but found `u32`
id_u8(b64); //~ ERROR mismatched types: expected `u8` but found `u64`
id_u8(b16); //~ ERROR mismatched types: expected `u8`, found `u16`
id_u8(b32); //~ ERROR mismatched types: expected `u8`, found `u32`
id_u8(b64); //~ ERROR mismatched types: expected `u8`, found `u64`
id_u16(b8); //~ ERROR mismatched types: expected `u16` but found `u8`
id_u16(b8); //~ ERROR mismatched types: expected `u16`, found `u8`
id_u16(b16); // ok
id_u16(b32); //~ ERROR mismatched types: expected `u16` but found `u32`
id_u16(b64); //~ ERROR mismatched types: expected `u16` but found `u64`
id_u16(b32); //~ ERROR mismatched types: expected `u16`, found `u32`
id_u16(b64); //~ ERROR mismatched types: expected `u16`, found `u64`
id_u32(b8); //~ ERROR mismatched types: expected `u32` but found `u8`
id_u32(b16); //~ ERROR mismatched types: expected `u32` but found `u16`
id_u32(b8); //~ ERROR mismatched types: expected `u32`, found `u8`
id_u32(b16); //~ ERROR mismatched types: expected `u32`, found `u16`
id_u32(b32); // ok
id_u32(b64); //~ ERROR mismatched types: expected `u32` but found `u64`
id_u32(b64); //~ ERROR mismatched types: expected `u32`, found `u64`
id_u64(b8); //~ ERROR mismatched types: expected `u64` but found `u8`
id_u64(b16); //~ ERROR mismatched types: expected `u64` but found `u16`
id_u64(b32); //~ ERROR mismatched types: expected `u64` but found `u32`
id_u64(b8); //~ ERROR mismatched types: expected `u64`, found `u8`
id_u64(b16); //~ ERROR mismatched types: expected `u64`, found `u16`
id_u64(b32); //~ ERROR mismatched types: expected `u64`, found `u32`
id_u64(b64); // ok
}

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

@ -12,4 +12,4 @@ fn f(_: extern "Rust" fn()) {}
extern fn bar() {}
fn main() { f(bar) }
//~^ ERROR: expected `fn()` but found `extern "C" fn()`
//~^ ERROR: expected `fn()`, found `extern "C" fn()`

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

@ -10,7 +10,7 @@
fn main() {
match Some(10) {
//~^ ERROR match arms have incompatible types: expected `bool` but found `()`
//~^ ERROR match arms have incompatible types: expected `bool`, found `()`
Some(5) => false,
Some(2) => true,
None => (), //~ NOTE match arm with an incompatible type

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

@ -14,5 +14,5 @@ struct Test<'s> {
fn main() {
let test = box Test { func: proc() {} };
//~^ ERROR: expected `||` but found `proc()`
//~^ ERROR: expected `||`, found `proc()`
}

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

@ -12,6 +12,6 @@
//! Test that makes sure wrongly-typed bench functions are rejected
// error-pattern:expected &-ptr but found int
// error-pattern:expected &-ptr, found int
#[bench]
fn bar(x: int) { }

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

@ -12,7 +12,7 @@ fn main() {
let x = [1,2];
let y = match x {
[] => None,
//~^ ERROR expected `[<generic integer #1>, .. 2]` but found a fixed vector pattern of size 0
//~^ ERROR expected `[<generic integer #1>, .. 2]`, found a fixed vector pattern of size 0
[a,_] => Some(a)
};
}

4
src/test/compile-fail/issue-13599.rs
View File

@ -16,8 +16,8 @@ fn expect_proc(_: proc()) {}
fn main() {
expect_closure(proc() {});
//~^ ERROR mismatched types: expected `||` but found `proc()` (expected closure, found proc)
//~^ ERROR mismatched types: expected `||`, found `proc()` (expected closure, found proc)
expect_proc(|| {});
//~^ ERROR mismatched types: expected `proc()` but found `||` (expected proc, found closure)
//~^ ERROR mismatched types: expected `proc()`, found `||` (expected proc, found closure)
}

4
src/test/compile-fail/issue-14845.rs
View File

@ -16,9 +16,9 @@ struct X {
fn main() {
let x = X { a: [0] };
let _f = &x.a as *mut u8;
//~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`
//~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, .. 1]`
let local = [0u8];
let _v = &local as *mut u8;
//~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`
//~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, .. 1]`
}

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

@ -18,7 +18,7 @@ struct Shower<T> {
impl<T: fmt::Show> ops::Fn<(), ()> for Shower<T> {
fn call(&self, _args: ()) {
//~^ ERROR `call` has an incompatible type for trait: expected "rust-call" fn but found "Rust" fn
//~^ ERROR `call` has an incompatible type for trait: expected "rust-call" fn, found "Rust" fn
println!("{}", self.x);
}
}

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

@ -12,6 +12,6 @@ use std::raw::Slice;
fn main() {
let Slice { data: data, len: len } = "foo";
//~^ ERROR mismatched types: expected `&'static str` but found a structure pattern
//~^ ERROR mismatched types: expected `&'static str`, found a structure pattern
}

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

@ -13,7 +13,7 @@ use std::raw::Slice;
fn main() {
match () {
Slice { data: data, len: len } => (),
//~^ ERROR mismatched types: expected `()` but found a structure pattern
//~^ ERROR mismatched types: expected `()`, found a structure pattern
_ => unreachable!()
}
}

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

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:expected `[` but found `vec`
// error-pattern:expected `[`, found `vec`
mod blade_runner {
#vec[doc(
brief = "Blade Runner is probably the best movie ever",

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

@ -10,7 +10,7 @@
fn foo<T, U>(x: T, y: U) {
let mut xx = x;
xx = y; //~ ERROR expected `T` but found `U`
xx = y; //~ ERROR expected `T`, found `U`
}
fn main() {

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

@ -13,4 +13,4 @@
fn main()
{
let x = 3
} //~ ERROR: expected `;` but found `}`
} //~ ERROR: expected `;`, found `}`

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

@ -9,5 +9,5 @@
// except according to those terms.
fn main() {
let _p: char = 100; //~ ERROR mismatched types: expected `char` but found
let _p: char = 100; //~ ERROR mismatched types: expected `char`, found
}

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

@ -12,6 +12,6 @@ fn main() {
match None {
Err(_) => ()
//~^ ERROR mismatched types: expected `core::option::Option<<generic #1>>`
// but found `core::result::Result<<generic #2>,<generic #3>>`
// , found `core::result::Result<<generic #2>,<generic #3>>`
}
}

4
src/test/compile-fail/issue-4517.rs
View File

@ -13,6 +13,6 @@ fn bar(int_param: int) {}
fn main() {
let foo: [u8, ..4] = [1u8, ..4u];
bar(foo);
//~^ ERROR mismatched types: expected `int` but found `[u8, .. 4]`
// (expected int but found vector)
//~^ ERROR mismatched types: expected `int`, found `[u8, .. 4]`
// (expected int, found vector)
}

4
src/test/compile-fail/issue-4968.rs
View File

@ -13,6 +13,6 @@
static A: (int,int) = (4,2);
fn main() {
match 42 { A => () }
//~^ ERROR mismatched types: expected `<generic integer #0>` but found `(int,int)`
// (expected integral variable but found tuple)
//~^ ERROR mismatched types: expected `<generic integer #0>`, found `(int,int)`
// (expected integral variable, found tuple)
}

14
src/test/compile-fail/issue-5100.rs
View File

@ -12,33 +12,33 @@ enum A { B, C }
fn main() {
match (true, false) {
B => (), //~ ERROR expected `(bool,bool)` but found an enum or structure pattern
B => (), //~ ERROR expected `(bool,bool)`, found an enum or structure pattern
_ => ()
}
match (true, false) {
(true, false, false) => ()
//~^ ERROR mismatched types: expected `(bool,bool)` but found tuple
// (expected a tuple with 2 elements but found one with 3 elements)
//~^ ERROR mismatched types: expected `(bool,bool)`, found tuple
// (expected a tuple with 2 elements, found one with 3 elements)
}
match (true, false) {
box (true, false) => ()
//~^ ERROR mismatched types: expected `(bool,bool)` but found a box pattern
//~^ ERROR mismatched types: expected `(bool,bool)`, found a box pattern
}
match (true, false) {
&(true, false) => ()
//~^ ERROR mismatched types: expected `(bool,bool)` but found an `&`-pointer pattern
//~^ ERROR mismatched types: expected `(bool,bool)`, found an `&`-pointer pattern
}
let v = [('a', 'b') //~ ERROR expected function but found `(char,char)`
let v = [('a', 'b') //~ ERROR expected function, found `(char,char)`
('c', 'd'),
('e', 'f')];
for &(x,y) in v.iter() {} // should be OK
// Make sure none of the errors above were fatal
let x: char = true; //~ ERROR expected `char` but found `bool`
let x: char = true; //~ ERROR expected `char`, found `bool`
}

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

@ -13,7 +13,7 @@ struct S(Either<uint, uint>);
fn main() {
match S(Left(5)) {
Right(_) => {} //~ ERROR mismatched types: expected `S` but found `Either
Right(_) => {} //~ ERROR mismatched types: expected `S`, found `Either
_ => {}
}
}

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

@ -8,6 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
trait Foo { fn a() } //~ ERROR expected `;` or `{` but found `}`
trait Foo { fn a() } //~ ERROR expected `;` or `{`, found `}`
fn main() {}

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

@ -15,7 +15,7 @@ struct BarStruct;
impl<'a> BarStruct {
fn foo(&'a mut self) -> Gc<BarStruct> { self }
//~^ ERROR: error: mismatched types: expected `Gc<BarStruct>` but found `&'a mut BarStruct
//~^ ERROR: error: mismatched types: expected `Gc<BarStruct>`, found `&'a mut BarStruct
}
fn main() {}

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

@ -14,7 +14,7 @@ enum Whatever {
fn foo(x: Whatever) {
match x {
Some(field) => field.access(),
//~^ ERROR: mismatched types: expected `Whatever` but found
//~^ ERROR: mismatched types: expected `Whatever`, found
}
}

4
src/test/compile-fail/issue-8761.rs
View File

@ -10,9 +10,9 @@
enum Foo {
A = 1i64,
//~^ ERROR mismatched types: expected `int` but found `i64`
//~^ ERROR mismatched types: expected `int`, found `i64`
B = 2u8
//~^ ERROR mismatched types: expected `int` but found `u8`
//~^ ERROR mismatched types: expected `int`, found `u8`
}
fn main() {}

4
src/test/compile-fail/issue13359.rs
View File

@ -14,8 +14,8 @@ fn bar(_s: u32) { }
fn main() {
foo(1*(1 as int));
//~^ ERROR: mismatched types: expected `i16` but found `int` (expected `i16` but found `int`)
//~^ ERROR: mismatched types: expected `i16`, found `int` (expected `i16`, found `int`)
bar(1*(1 as uint));
//~^ ERROR: mismatched types: expected `u32` but found `uint` (expected `u32` but found `uint`)
//~^ ERROR: mismatched types: expected `u32`, found `uint` (expected `u32`, found `uint`)
}

2
src/test/compile-fail/loop-does-not-diverge.rs
View File

@ -14,7 +14,7 @@ fn forever() -> ! {
loop {
break;
}
return 42i; //~ ERROR expected `!` but found `int`
return 42i; //~ ERROR expected `!`, found `int`
}
fn main() {

2
src/test/compile-fail/macro-bad-delimiter-ident.rs
View File

@ -9,5 +9,5 @@
// except according to those terms.
fn main() {
foo! bar < //~ ERROR expected `(` or `{`, but found `<`
foo! bar < //~ ERROR expected `(` or `{`, found `<`
}

2
src/test/compile-fail/match-struct.rs
View File

@ -14,7 +14,7 @@ enum E { C(int) }
fn main() {
match (S { a: 1 }) {
C(_) => (), //~ ERROR mismatched types: expected `S` but found `E`
C(_) => (), //~ ERROR mismatched types: expected `S`, found `E`
_ => ()
}
}

2
src/test/compile-fail/match-vec-mismatch-2.rs
View File

@ -10,6 +10,6 @@
fn main() {
match () {
[()] => { } //~ ERROR mismatched types: expected `()` but found a vector pattern
[()] => { } //~ ERROR mismatched types: expected `()`, found a vector pattern
}
}

2
src/test/compile-fail/multitrait.rs
View File

@ -12,7 +12,7 @@ struct S {
y: int
}
impl Cmp, ToString for S { //~ ERROR: expected `{` but found `,`
impl Cmp, ToString for S { //~ ERROR: expected `{`, found `,`
fn eq(&&other: S) { false }
fn to_string(&self) -> String { "hi".to_string() }
}

2
src/test/compile-fail/mut-patterns.rs
View File

@ -12,5 +12,5 @@
pub fn main() {
struct Foo { x: int }
let mut Foo { x: x } = Foo { x: 3 }; //~ ERROR: expected `;` but found `{`
let mut Foo { x: x } = Foo { x: 3 }; //~ ERROR: expected `;`, found `{`
}

2
src/test/compile-fail/noexporttypeexe.rs
View File

@ -18,5 +18,5 @@ fn main() {
// because the def_id associated with the type was
// not convertible to a path.
let x: int = noexporttypelib::foo();
//~^ ERROR expected `int` but found `core::option::Option<int>`
//~^ ERROR expected `int`, found `core::option::Option<int>`
}

2
src/test/compile-fail/non-constant-enum-for-vec-repeat.rs
View File

@ -12,5 +12,5 @@ enum State { ST_NULL, ST_WHITESPACE }
fn main() {
[ST_NULL, ..(ST_WHITESPACE as uint)];
//~^ ERROR expected constant integer for repeat count but found variable
//~^ ERROR expected constant integer for repeat count, found variable
}

2
src/test/compile-fail/non-constant-expr-for-vec-repeat.rs
View File

@ -12,6 +12,6 @@
fn main() {
fn bar(n: uint) {
let _x = [0, ..n]; //~ ERROR expected constant integer for repeat count but found variable
let _x = [0, ..n]; //~ ERROR expected constant integer for repeat count, found variable
}
}

2
src/test/compile-fail/omitted-arg-in-item-fn.rs
View File

@ -8,5 +8,5 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn foo(x) { //~ ERROR expected `:` but found `)`
fn foo(x) { //~ ERROR expected `:`, found `)`
}

4
src/test/compile-fail/pattern-error-continue.rs
View File

@ -29,9 +29,9 @@ fn main() {
_ => ()
}
match 'c' {
S { .. } => (), //~ ERROR mismatched types: expected `char` but found a structure pattern
S { .. } => (), //~ ERROR mismatched types: expected `char`, found a structure pattern
_ => ()
}
f(true); //~ ERROR mismatched types: expected `char` but found `bool`
f(true); //~ ERROR mismatched types: expected `char`, found `bool`
}

4
src/test/compile-fail/pptypedef.rs
View File

@ -12,8 +12,8 @@ fn let_in<T>(x: T, f: |T|) {}
fn main() {
let_in(3u, |i| { assert!(i == 3i); });
//~^ ERROR expected `uint` but found `int`
//~^ ERROR expected `uint`, found `int`
let_in(3i, |i| { assert!(i == 3u); });
//~^ ERROR expected `int` but found `uint`
//~^ ERROR expected `int`, found `uint`
}

2
src/test/compile-fail/raw-str-unbalanced.rs
View File

@ -10,5 +10,5 @@
static s: &'static str =
r#"
"## //~ ERROR expected `;` but found `#`
"## //~ ERROR expected `;`, found `#`
;

4
src/test/compile-fail/regions-bounds.rs
View File

@ -16,12 +16,12 @@ struct an_enum<'a>(&'a int);
struct a_class<'a> { x:&'a int }
fn a_fn1<'a,'b>(e: an_enum<'a>) -> an_enum<'b> {
return e; //~ ERROR mismatched types: expected `an_enum<'b>` but found `an_enum<'a>`
return e; //~ ERROR mismatched types: expected `an_enum<'b>`, found `an_enum<'a>`
//~^ ERROR cannot infer
}
fn a_fn3<'a,'b>(e: a_class<'a>) -> a_class<'b> {
return e; //~ ERROR mismatched types: expected `a_class<'b>` but found `a_class<'a>`
return e; //~ ERROR mismatched types: expected `a_class<'b>`, found `a_class<'a>`
//~^ ERROR cannot infer
}

2
src/test/compile-fail/regions-infer-paramd-indirect.rs
View File

@ -32,7 +32,7 @@ impl<'a> set_f<'a> for c<'a> {
}
fn set_f_bad(&self, b: Gc<b>) {
self.f = b; //~ ERROR mismatched types: expected `Gc<Gc<&'a int>>` but found `Gc<Gc<&int>>`
self.f = b; //~ ERROR mismatched types: expected `Gc<Gc<&'a int>>`, found `Gc<Gc<&int>>`
//~^ ERROR cannot infer
}
}

2
src/test/compile-fail/regions-infer-paramd-method.rs
View File

@ -40,7 +40,7 @@ trait set_foo_foo {
impl<'a> set_foo_foo for with_foo<'a> {
fn set_foo(&mut self, f: @foo) {
self.f = f; //~ ERROR mismatched types: expected `@foo/&self` but found `@foo/&`
self.f = f; //~ ERROR mismatched types: expected `@foo/&self`, found `@foo/&`
}
}

2
src/test/compile-fail/regions-trait-3.rs
View File

@ -26,7 +26,7 @@ trait get_ctxt<'a> {
}
fn make_gc1(gc: @get_ctxt<'a>) -> @get_ctxt<'b> {
return gc; //~ ERROR mismatched types: expected `@get_ctxt/&b` but found `@get_ctxt/&a`
return gc; //~ ERROR mismatched types: expected `@get_ctxt/&b`, found `@get_ctxt/&a`
}
struct Foo {

2
src/test/compile-fail/removed-syntax-closure-lifetime.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
type closure = Box<lt/fn()>; //~ ERROR expected `,` but found `/`
type closure = Box<lt/fn()>; //~ ERROR expected `,`, found `/`

2
src/test/compile-fail/removed-syntax-const-item.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
const i: int = 42; //~ ERROR expected item but found `const`
const i: int = 42; //~ ERROR expected item, found `const`

2
src/test/compile-fail/removed-syntax-enum-newtype.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
enum e = int; //~ ERROR expected `{` but found `=`
enum e = int; //~ ERROR expected `{`, found `=`

2
src/test/compile-fail/removed-syntax-field-let.rs
View File

@ -11,5 +11,5 @@
struct s {
let foo: (),
//~^ ERROR found `let` in ident position
//~^^ ERROR expected `:` but found `foo`
//~^^ ERROR expected `:`, found `foo`
}

2
src/test/compile-fail/removed-syntax-field-semicolon.rs
View File

@ -10,5 +10,5 @@
struct s {
bar: ();
//~^ ERROR expected `,`, or `}` but found `;`
//~^ ERROR expected `,`, or `}`, found `;`
}

2
src/test/compile-fail/removed-syntax-fixed-vec.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
type v = [int * 3]; //~ ERROR expected `]` but found `*`
type v = [int * 3]; //~ ERROR expected `]`, found `*`

2
src/test/compile-fail/removed-syntax-fn-pure.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
pure fn f() {} //~ ERROR expected item but found `pure`
pure fn f() {} //~ ERROR expected item, found `pure`

2
src/test/compile-fail/removed-syntax-fn-sigil.rs
View File

@ -9,5 +9,5 @@
// except according to those terms.
fn f() {
let x: fn~() = || (); //~ ERROR expected `(` but found `~`
let x: fn~() = || (); //~ ERROR expected `(`, found `~`
}

2
src/test/compile-fail/removed-syntax-larrow-init.rs
View File

@ -11,5 +11,5 @@
fn removed_moves() {
let mut x = 0;
let y <- x;
//~^ ERROR expected `;` but found `<-`
//~^ ERROR expected `;`, found `<-`
}

2
src/test/compile-fail/removed-syntax-larrow-move.rs
View File

@ -12,5 +12,5 @@ fn removed_moves() {
let mut x = 0;
let y = 0;
y <- x;
//~^ ERROR expected one of `;`, `}` but found `<-`
//~^ ERROR expected one of `;`, `}`, found `<-`
}

2
src/test/compile-fail/removed-syntax-mut-vec-expr.rs
View File

@ -11,5 +11,5 @@
fn f() {
let v = [mut 1, 2, 3, 4];
//~^ ERROR found `mut` in ident position
//~^^ ERROR expected `]` but found `1`
//~^^ ERROR expected `]`, found `1`
}

2
src/test/compile-fail/removed-syntax-mut-vec-ty.rs
View File

@ -10,4 +10,4 @@
type v = [mut int];
//~^ ERROR found `mut` in ident position
//~^^ ERROR expected `]` but found `int`
//~^^ ERROR expected `]`, found `int`

2
src/test/compile-fail/removed-syntax-ptr-lifetime.rs
View File

@ -8,4 +8,4 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
type bptr = &lifetime/int; //~ ERROR expected `;` but found `/`
type bptr = &lifetime/int; //~ ERROR expected `;`, found `/`

2
src/test/compile-fail/removed-syntax-uniq-mut-expr.rs
View File

@ -11,5 +11,5 @@
fn f() {
let a_box = box mut 42;
//~^ ERROR found `mut` in ident position
//~^^ ERROR expected `;` but found `42`
//~^^ ERROR expected `;`, found `42`
}

2
src/test/compile-fail/removed-syntax-uniq-mut-ty.rs
View File

@ -10,4 +10,4 @@
type mut_box = Box<mut int>;
//~^ ERROR found `mut` in ident position
//~^^ ERROR expected `,` but found `int`
//~^^ ERROR expected `,`, found `int`

2
src/test/compile-fail/removed-syntax-with-1.rs
View File

@ -16,5 +16,5 @@ fn removed_with() {
let a = S { foo: (), bar: () };
let b = S { foo: () with a };
//~^ ERROR expected one of `,`, `}` but found `with`
//~^ ERROR expected one of `,`, `}`, found `with`
}

2
src/test/compile-fail/removed-syntax-with-2.rs
View File

@ -16,5 +16,5 @@ fn removed_with() {
let a = S { foo: (), bar: () };
let b = S { foo: (), with a };
//~^ ERROR expected `:` but found `a`
//~^ ERROR expected `:`, found `a`
}

22
src/test/compile-fail/repeat_count.rs
View File

@ -12,17 +12,17 @@
fn main() {
let n = 1;
let a = [0, ..n]; //~ ERROR expected constant integer for repeat count but found variable
let b = [0, ..()]; //~ ERROR expected positive integer for repeat count but found ()
//~^ ERROR: expected `uint` but found `()`
let c = [0, ..true]; //~ ERROR expected positive integer for repeat count but found boolean
//~^ ERROR: expected `uint` but found `bool`
let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count but found float
//~^ ERROR: expected `uint` but found `<generic float #0>`
let e = [0, .."foo"]; //~ ERROR expected positive integer for repeat count but found string
//~^ ERROR: expected `uint` but found `&'static str`
let a = [0, ..n]; //~ ERROR expected constant integer for repeat count, found variable
let b = [0, ..()]; //~ ERROR expected positive integer for repeat count, found ()
//~^ ERROR: expected `uint`, found `()`
let c = [0, ..true]; //~ ERROR expected positive integer for repeat count, found boolean
//~^ ERROR: expected `uint`, found `bool`
let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count, found float
//~^ ERROR: expected `uint`, found `<generic float #0>`
let e = [0, .."foo"]; //~ ERROR expected positive integer for repeat count, found string
//~^ ERROR: expected `uint`, found `&'static str`
let f = [0, ..-4];
//~^ ERROR expected positive integer for repeat count but found negative integer
//~^ ERROR expected positive integer for repeat count, found negative integer
let f = [0u, ..-1];
//~^ ERROR expected positive integer for repeat count but found negative integer
//~^ ERROR expected positive integer for repeat count, found negative integer
}

2
src/test/compile-fail/slightly-nice-generic-literal-messages.rs
View File

@ -13,7 +13,7 @@ struct Foo<T,U>(T);
fn main() {
match Foo(1.1) {
1 => {}
//~^ ERROR expected `Foo<<generic float #0>,<generic #2>>` but found `<generic integer #0>`
//~^ ERROR expected `Foo<<generic float #0>,<generic #2>>`, found `<generic integer #0>`
}
}

4
src/test/compile-fail/struct-base-wrong-type.rs
View File

@ -12,11 +12,11 @@ struct Foo { a: int, b: int }
struct Bar { x: int }
static bar: Bar = Bar { x: 5 };
static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types: expected `Foo` but found `Bar`
static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types: expected `Foo`, found `Bar`
static foo_i: Foo = Foo { a: 2, ..4 }; //~ ERROR mismatched types: expected `Foo`
fn main() {
let b = Bar { x: 5 };
let f = Foo { a: 2, ..b }; //~ ERROR mismatched types: expected `Foo` but found `Bar`
let f = Foo { a: 2, ..b }; //~ ERROR mismatched types: expected `Foo`, found `Bar`
let f_i = Foo { a: 2, ..4 }; //~ ERROR mismatched types: expected `Foo`
}

8
src/test/compile-fail/structure-constructor-type-mismatch.rs
View File

@ -24,25 +24,25 @@ type PairF<U> = Pair<f32,U>;
fn main() {
let pt = PointF {
//~^ ERROR expected f32 but found int
//~^ ERROR expected f32, found int
x: 1i,
y: 2i,
};
let pt2 = Point::<f32> {
//~^ ERROR expected f32 but found int
//~^ ERROR expected f32, found int
x: 3i,
y: 4i,
};
let pair = PairF {
//~^ ERROR expected f32 but found int
//~^ ERROR expected f32, found int
x: 5i,
y: 6i,
};
let pair2 = PairF::<int> {
//~^ ERROR expected f32 but found int
//~^ ERROR expected f32, found int
x: 7i,
y: 8i,
};

Some files were not shown because too many files have changed in this diff Show More