Rustup to rustc 1.37.0-nightly (3ade426ed 2019-05-30)

Author: bjorn3

src/common.rs

@@ -569,7 +569,7 @@ pub struct FunctionCx<'a, 'tcx: 'a, B: Backend> {
     pub pointer_type: Type, // Cached from module
 
     pub instance: Instance<'tcx>,
-    pub mir: &'tcx Mir<'tcx>,
+    pub mir: &'tcx Body<'tcx>,
 
     pub bcx: FunctionBuilder<'a>,
     pub ebb_map: HashMap<BasicBlock, Ebb>,

src/constant.rs

@@ -359,7 +359,7 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
         _: &[OpTy<'tcx>],
         _: Option<PlaceTy<'tcx>>,
         _: Option<BasicBlock>,
-    ) -> EvalResult<'tcx, Option<&'mir Mir<'tcx>>> {
+    ) -> EvalResult<'tcx, Option<&'mir Body<'tcx>>> {
         panic!();
     }
 

src/debuginfo.rs

@@ -229,7 +229,7 @@ impl<'a, 'b, 'tcx: 'b> FunctionDebugContext<'a, 'tcx> {
     pub fn new(
         tcx: TyCtxt<'b, 'tcx, 'tcx>,
         debug_context: &'a mut DebugContext<'tcx>,
-        mir: &Mir,
+        mir: &Body,
         name: &str,
         _sig: &Signature,
     ) -> Self {
@@ -268,7 +268,7 @@ impl<'a, 'b, 'tcx: 'b> FunctionDebugContext<'a, 'tcx> {
         &mut self,
         tcx: TyCtxt,
         context: &Context,
-        isa: &cranelift::codegen::isa::TargetIsa,
+        isa: &dyn cranelift::codegen::isa::TargetIsa,
         source_info_set: &indexmap::IndexSet<SourceInfo>,
     ) {
         let line_program = &mut self.debug_context.dwarf.unit.line_program;

src/lib.rs

@@ -237,7 +237,7 @@ fn target_triple(sess: &Session) -> target_lexicon::Triple {
     target.parse().unwrap()
 }
 
-fn build_isa(sess: &Session) -> Box<isa::TargetIsa + 'static> {
+fn build_isa(sess: &Session) -> Box<dyn isa::TargetIsa + 'static> {
     let mut flags_builder = settings::builder();
     flags_builder.enable("is_pic").unwrap();
     flags_builder.set("probestack_enabled", "false").unwrap(); // ___cranelift_probestack is not provided

src/pretty_clif.rs

@@ -117,7 +117,7 @@ impl<'a> FuncWriter for &'a CommentWriter {
         w: &mut dyn fmt::Write,
         _func: &Function,
         entity: AnyEntity,
-        value: &fmt::Display,
+        value: &dyn fmt::Display,
     ) -> fmt::Result {
         write!(w, "    {} = {}", entity, value)?;