diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-04-10 18:15:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 18:15:16 +0200 |
| commit | 1fe86f47d82263404d088e4fd2f406d056f8babc (patch) | |
| tree | 9080ec801592c01e0e40ca1b0b1b14fc3983507c /src/librustc_mir | |
| parent | dbc3cfdd25ccd56edf3ea364f86ab32967636c26 (diff) | |
| parent | d605a9d9695955324760194f18ec46e7f7824105 (diff) | |
| download | rust-1fe86f47d82263404d088e4fd2f406d056f8babc.tar.gz rust-1fe86f47d82263404d088e4fd2f406d056f8babc.zip | |
Rollup merge of #69745 - estebank:predicate-obligations-3, r=nikomatsakis,eddyb
Use `PredicateObligation`s instead of `Predicate`s Keep more information about trait binding failures. Use more specific spans by pointing at bindings that introduce obligations. Subset of #69709. r? @eddyb
Diffstat (limited to 'src/librustc_mir')
| -rw-r--r-- | src/librustc_mir/transform/const_prop.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index 25719d037f9..5a00f206a76 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -126,7 +126,7 @@ impl<'tcx> MirPass<'tcx> for ConstProp { .collect(); if !traits::normalize_and_test_predicates( tcx, - traits::elaborate_predicates(tcx, predicates).collect(), + traits::elaborate_predicates(tcx, predicates).map(|o| o.predicate).collect(), ) { trace!("ConstProp skipped for {:?}: found unsatisfiable predicates", source.def_id()); return; |