Skip to content

Commit fd278a8

Browse files
committed
Avoid flow-on Iterator error for for ... in [ty err] {}.
This squashes the > `for` loop expression has type `[type error]` which does not implement > the `Iterator` trait message that one received when writing `for ... in x` where was previously found to have a type error. Fixes rust-lang#16042.
1 parent 2e4a21c commit fd278a8

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

src/librustc/middle/typeck/check/mod.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,10 +2184,15 @@ fn lookup_method_for_for_loop(fcx: &FnCtxt,
21842184
let method_type = match method {
21852185
Some(ref method) => method.ty,
21862186
None => {
2187-
fcx.tcx().sess.span_err(iterator_expr.span,
2188-
format!("`for` loop expression has type `{}` which does \
2189-
not implement the `Iterator` trait",
2190-
fcx.infcx().ty_to_string(expr_type)).as_slice());
2187+
let true_expr_type = fcx.infcx().resolve_type_vars_if_possible(expr_type);
2188+
2189+
if !ty::type_is_error(true_expr_type) {
2190+
let ty_string = fcx.infcx().ty_to_string(true_expr_type);
2191+
fcx.tcx().sess.span_err(iterator_expr.span,
2192+
format!("`for` loop expression has type `{}` which does \
2193+
not implement the `Iterator` trait",
2194+
ty_string).as_slice());
2195+
}
21912196
ty::mk_err()
21922197
}
21932198
};
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub fn main() {
12+
let x = () + (); //~ ERROR binary operation
13+
14+
// this shouldn't have a flow-on error:
15+
for _ in x {}
16+
}

0 commit comments

Comments
 (0)