Fix compilation issues with rustc 1.31.1

bytecodealliance · Jan 24, 2019 · 7213de5 · 7213de5
1 parent cbcf018
commit 7213de5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/runtime/src/instance.rs b/lib/runtime/src/instance.rs
@@ -27,7 +27,7 @@ use cranelift_wasm::{
 use indexmap;
 use std::borrow::ToOwned;
 use std::boxed::Box;
-use std::collections::{hash_map, HashMap};
+use std::collections::HashMap;
 use std::rc::Rc;
 use std::string::{String, ToString};
 use wasmtime_environ::{DataInitializer, Module, TableElements, VMOffsets};
@@ -700,7 +700,7 @@ impl Instance {
 
         // Collect the exports for the global export map.
         for (field, decl) in &module.exports {
-            use hash_map::Entry::*;
+            use std::collections::hash_map::Entry::*;
             let cell: &RefCell<HashMap<std::string::String, core::option::Option<Export>>> =
                 contents.global_exports.borrow();
             let map: &mut HashMap<std::string::String, core::option::Option<Export>> =

diff --git a/lib/runtime/src/vmcontext.rs b/lib/runtime/src/vmcontext.rs
@@ -409,7 +409,7 @@ mod test_vmshared_signature_index {
 impl VMSharedSignatureIndex {
     /// Create a new `VMSharedSignatureIndex`.
     pub fn new(value: u32) -> Self {
-        Self(value)
+        VMSharedSignatureIndex(value)
     }
 }