]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20706: nikomatsakis/assoc-types-projections-in-structs-issue-20470
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:35:00 +0000 (17:35 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:35:00 +0000 (17:35 -0800)
commitbcebec508422e3dc88215a621f3b51beb88b0330
treeef21ffee1018a7073fc57aa9eeb4130abec97656
parent51357e04be5482d746053646b2af68cd34563ced
parentcb98c3d93a4c0e79ae87a04a6d3a439ac8ed87b1
rollup merge of #20706: nikomatsakis/assoc-types-projections-in-structs-issue-20470

Conflicts:
src/librustc_trans/trans/expr.rs
src/librustc/middle/traits/select.rs
src/librustc/middle/ty.rs
src/librustc/middle/ty_fold.rs
src/librustc_trans/trans/adt.rs
src/librustc_trans/trans/common.rs
src/librustc_trans/trans/expr.rs
src/librustc_trans/trans/monomorphize.rs
src/librustc_typeck/astconv.rs
src/librustc_typeck/check/mod.rs