]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 525aa61 de82fc4)
Auto merge of #32780 - soltanmm:consider-the-following, r=nikomatsakis
authorbors <bors@rust-lang.org>
Wed, 13 Apr 2016 18:28:30 +0000 (11:28 -0700)
committerbors <bors@rust-lang.org>
Wed, 13 Apr 2016 18:28:30 +0000 (11:28 -0700)
commit35dca7fb7b7304cfa8da027d1be6eea7142d90d6
treea60302779e6e49f13acb662d1914e3191ba3a84dtree | snapshot
parent525aa6102250ec2a33c7066dfb966524f0ce3e21commit | diff
parentde82fc4dc6bbb87e50618f40e8fc671fb016f815commit | diff
Auto merge of #32780 - soltanmm:consider-the-following, r=nikomatsakis

Replace consider_unification_despite_ambiguity with new obligation variant

Is work towards #32730. Addresses part one of #32286. Addresses #24210 and #26046 to some degree.

r? @nikomatsakis
16 files changed:
src/librustc/diagnostics.rs diff1 | diff2 | blob | history
src/librustc/traits/error_reporting.rs diff1 | diff2 | blob | history
src/librustc/traits/object_safety.rs diff1 | diff2 | blob | history
src/librustc/traits/select.rs diff1 | diff2 | blob | history
src/librustc/traits/util.rs diff1 | diff2 | blob | history
src/librustc/ty/mod.rs diff1 | diff2 | blob | history
src/librustc/ty/structural_impls.rs diff1 | diff2 | blob | history
src/librustc/ty/util.rs diff1 | diff2 | blob | history
src/librustc/ty/wf.rs diff1 | diff2 | blob | history
src/librustc/util/ppaux.rs diff1 | diff2 | blob | history
src/librustc_metadata/tydecode.rs diff1 | diff2 | blob | history
src/librustc_metadata/tyencode.rs diff1 | diff2 | blob | history
src/librustc_typeck/check/closure.rs diff1 | diff2 | blob | history
src/librustc_typeck/check/method/probe.rs diff1 | diff2 | blob | history
src/librustc_typeck/collect.rs diff1 | diff2 | blob | history
src/librustdoc/clean/mod.rs diff1 | diff2 | blob | history
Empowering everyone to build reliable and efficient software.