Auto merge of #965 - RalfJung:rustup, r=RalfJung

rustup

rust-version

@@ -1 +1 @@
-dc45735f29788924b9fc351d100e5bf3ebdca162
+084beb83e0e87d673d5fabc844d28e8e8ae2ab4c

src/bin/miri-rustc-tests.rs

@@ -46,7 +46,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                 struct Visitor<'tcx>(TyCtxt<'tcx>);
                 impl<'tcx, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'tcx> {
                     fn visit_item(&mut self, i: &'hir hir::Item) {
-                        if let hir::ItemKind::Fn(.., body_id) = i.node {
+                        if let hir::ItemKind::Fn(.., body_id) = i.kind {
                             if i.attrs.iter().any(|attr| attr.check_name(syntax::symbol::sym::test)) {
                                 let config = MiriConfig {
                                     validate: true,

src/eval.rs

@@ -63,7 +63,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
         ty::ParamEnv::reveal_all(),
         start_id,
         ecx.tcx.mk_substs(
-            ::std::iter::once(ty::subst::Kind::from(main_ret_ty)))
+            ::std::iter::once(ty::subst::GenericArg::from(main_ret_ty)))
         ).unwrap();
     let start_mir = ecx.load_mir(start_instance.def, None)?;