Add dyn to traits and bump Rust version

README.md

@@ -11,7 +11,7 @@ utility or as a library embedded in a larger application.
 
 [![Build Status](https://dev.azure.com/CraneStation/Wasmtime/_apis/build/status/CraneStation.wasmtime?branchName=master)](https://dev.azure.com/CraneStation/Wasmtime/_build/latest?definitionId=4&branchName=master)
 [![Gitter chat](https://badges.gitter.im/CraneStation/CraneStation.svg)](https://gitter.im/CraneStation/Lobby)
-![Minimum rustc 1.36](https://img.shields.io/badge/rustc-1.36+-green.svg)
+![Minimum rustc 1.37](https://img.shields.io/badge/rustc-1.37+-green.svg)
 
 Wasmtime passes the WebAssembly spec testsuite, and supports a new system
 API proposal called [WebAssembly System Interface], or WASI.

wasmtime-debug/src/write_debuginfo.rs

@@ -25,7 +25,7 @@ pub trait SymbolResolver {
 pub fn emit_dwarf(
     artifact: &mut Artifact,
     mut dwarf: Dwarf,
-    symbol_resolver: &SymbolResolver,
+    symbol_resolver: &dyn SymbolResolver,
 ) -> result::Result<(), failure::Error> {
     let endian = RunTimeEndian::Little;
 
@@ -61,11 +61,11 @@ pub fn emit_dwarf(
 pub struct WriterRelocate<'a> {
     relocs: Vec<DebugReloc>,
     writer: EndianVec<RunTimeEndian>,
-    symbol_resolver: &'a SymbolResolver,
+    symbol_resolver: &'a dyn SymbolResolver,
 }
 
 impl<'a> WriterRelocate<'a> {
-    pub fn new(endian: RunTimeEndian, symbol_resolver: &'a SymbolResolver) -> Self {
+    pub fn new(endian: RunTimeEndian, symbol_resolver: &'a dyn SymbolResolver) -> Self {
         WriterRelocate {
             relocs: Vec::new(),
             writer: EndianVec::new(endian),

wasmtime-environ/src/cranelift.rs

@@ -96,7 +96,7 @@ fn get_function_address_map<'data>(
     context: &Context,
     data: &FunctionBodyData<'data>,
     body_len: usize,
-    isa: &isa::TargetIsa,
+    isa: &dyn isa::TargetIsa,
 ) -> FunctionAddressMap {
     let mut instructions = Vec::new();
 

wasmtime-jit/src/context.rs

@@ -105,7 +105,7 @@ impl Context {
     }
 
     /// Construct a new instance of `Context` with the given target.
-    pub fn with_isa(isa: Box<TargetIsa>) -> Self {
+    pub fn with_isa(isa: Box<dyn TargetIsa>) -> Self {
         Self::new(Box::new(Compiler::new(isa)))
     }
 

wasmtime-runtime/src/instance.rs

@@ -441,7 +441,7 @@ impl Instance {
     }
 
     /// Return a reference to the custom state attached to this instance.
-    pub fn host_state(&mut self) -> &mut Any {
+    pub fn host_state(&mut self) -> &mut dyn Any {
         &mut *self.host_state
     }
 
@@ -855,7 +855,7 @@ impl InstanceHandle {
     }
 
     /// Return a reference to the custom state attached to this instance.
-    pub fn host_state(&mut self) -> &mut Any {
+    pub fn host_state(&mut self) -> &mut dyn Any {
         self.instance_mut().host_state()
     }
 

wasmtime-runtime/src/vmcontext.rs

@@ -527,7 +527,7 @@ impl VMContext {
     ///
     /// This is unsafe because it doesn't work on just any `VMContext`, it must
     /// be a `VMContext` allocated as part of an `Instance`.
-    pub unsafe fn host_state(&mut self) -> &mut Any {
+    pub unsafe fn host_state(&mut self) -> &mut dyn Any {
         self.instance().host_state()
     }