Merge pull request rust-lang#192 from dwrensha/rustup

update for latest nightly rustc

Author: eddyb

src/eval_context.rs

@@ -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,

src/traits.rs

@@ -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(