]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #20412 : nikomatsakis/rust/assoc-types, r=aturon
authorbors <bors@rust-lang.org>
Fri, 2 Jan 2015 08:11:19 +0000 (08:11 +0000)
committerbors <bors@rust-lang.org>
Fri, 2 Jan 2015 08:11:19 +0000 (08:11 +0000)
These changes fix various problems encountered getting japaric's `at-iter` branch to work. This branch converts the `Iterator` trait to use an associated type.

1  2 
src/librustc/middle/expr_use_visitor.rs
src/librustc/middle/ty.rs
src/librustc_typeck/check/mod.rs

Simple merge
Simple merge