]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20594: nikomatsakis/orphan-ordered
authorAlex Crichton <alex@alexcrichton.com>
Tue, 6 Jan 2015 02:42:34 +0000 (18:42 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 6 Jan 2015 02:42:34 +0000 (18:42 -0800)
commitcf8a11e98bf3871cf3475913fd68187784b542a3
tree656a2f3aacc54d4e645695a3f22df1e8d1249d13
parentf3ad232022eeb0f0399ce433de677133d9df3ade
parent6e68fd09edc7ed37fd76f703247b5410cd338bfe
rollup merge of #20594: nikomatsakis/orphan-ordered

Conflicts:
src/libsyntax/feature_gate.rs
src/libcore/borrow.rs
src/librustc/lint/builtin.rs
src/librustc/middle/traits/coherence.rs
src/librustc_typeck/check/callee.rs
src/librustc_typeck/coherence/orphan.rs
src/libsyntax/feature_gate.rs