Merge pull request #192 from dwrensha/rustup

update for latest nightly rustc
This commit is contained in:
Eduard-Mihai Burtescu 2017-06-11 04:39:33 +03:00 committed by GitHub
commit cb10f2f369
2 changed files with 2 additions and 2 deletions

View File

@ -2032,7 +2032,7 @@ fn fulfill_obligation<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
// Do the initial selection for the obligation. This yields the
// shallow result we are looking for -- that is, what specific impl.
tcx.infer_ctxt(()).enter(|infcx| {
tcx.infer_ctxt().enter(|infcx| {
let mut selcx = traits::SelectionContext::new(&infcx);
let obligation_cause = traits::ObligationCause::misc(span,

View File

@ -16,7 +16,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
pub(crate) fn fulfill_obligation(&self, trait_ref: ty::PolyTraitRef<'tcx>) -> traits::Vtable<'tcx, ()> {
// Do the initial selection for the obligation. This yields the shallow result we are
// looking for -- that is, what specific impl.
self.tcx.infer_ctxt(()).enter(|infcx| {
self.tcx.infer_ctxt().enter(|infcx| {
let mut selcx = traits::SelectionContext::new(&infcx);
let obligation = traits::Obligation::new(