rust/src/librustc_typeck
Simonas Kazlauskas 7a3704c500 Fix rebase fallout
This commit includes manual merge conflict resolution changes from a rebase by @est31.
2016-12-30 15:17:27 +01:00
..
check Fix rebase fallout 2016-12-30 15:17:27 +01:00
coherence Such large. Very 128. Much bits. 2016-12-30 15:15:44 +01:00
variance rustc: separate TraitItem from their parent Item, just like ImplItem. 2016-12-28 11:21:45 +02:00
astconv.rs rustc: always print nested nodes where a HIR map is available. 2016-12-28 11:29:20 +02:00
Cargo.toml move the impl-params-constrained check out of collect 2016-11-16 13:57:46 -05:00
check_unused.rs rustc: separate TraitItem from their parent Item, just like ImplItem. 2016-12-28 11:21:45 +02:00
collect.rs Such large. Very 128. Much bits. 2016-12-30 15:15:44 +01:00
constrained_type_params.rs move the impl-params-constrained check out of collect 2016-11-16 13:57:46 -05:00
diagnostics.rs rustc: separate bodies for static/(associated)const and embedded constants. 2016-12-28 11:27:57 +02:00
impl_wf_check.rs rustc: separate TraitItem from their parent Item, just like ImplItem. 2016-12-28 11:21:45 +02:00
lib.rs Return DiagnosticBuilder to add help suggestions 2016-12-20 11:37:15 +01:00
rscope.rs rustc: move function arguments into hir::Body. 2016-12-28 11:29:19 +02:00