Fix no_std; upgrade hashmap_core. (bytecodealliance#98)

Author: yurydelendik

Cargo.toml

@@ -16,7 +16,7 @@ exclude = ["fuzz/**/*", "tests/**/*"]
 criterion = "0.2"
 
 [dependencies.hashmap_core]
-version = "0.1.9"
+version = "0.1.10"
 optional = true
 
 [badges]

src/lib.rs

@@ -24,7 +24,6 @@
 //! a data-structure using this library.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(not(feature = "std"), feature(alloc))]
 
 #[cfg(not(feature = "std"))]
 extern crate hashmap_core;
@@ -124,7 +123,7 @@ mod validator;
 
 #[cfg(not(feature = "std"))]
 mod std {
-    pub use alloc::{boxed, vec};
+    pub use alloc::{boxed, string, vec};
     pub use core::*;
     pub mod collections {
         pub use hashmap_core::HashSet;

src/parser.rs

@@ -269,8 +269,12 @@ impl<'a> Parser<'a> {
                 .original_position();
         }
         match self.section_reader {
-            ParserSectionReader::CodeSectionReader(ref reader) => return reader.original_position(),
-            ParserSectionReader::DataSectionReader(ref reader) => return reader.original_position(),
+            ParserSectionReader::CodeSectionReader(ref reader) => {
+                return reader.original_position()
+            }
+            ParserSectionReader::DataSectionReader(ref reader) => {
+                return reader.original_position()
+            }
             ParserSectionReader::ElementSectionReader(ref reader) => {
                 return reader.original_position();
             }
@@ -292,8 +296,12 @@ impl<'a> Parser<'a> {
             ParserSectionReader::TableSectionReader(ref reader) => {
                 return reader.original_position();
             }
-            ParserSectionReader::TypeSectionReader(ref reader) => return reader.original_position(),
-            ParserSectionReader::NameSectionReader(ref reader) => return reader.original_position(),
+            ParserSectionReader::TypeSectionReader(ref reader) => {
+                return reader.original_position()
+            }
+            ParserSectionReader::NameSectionReader(ref reader) => {
+                return reader.original_position()
+            }
             ParserSectionReader::LinkingSectionReader(ref reader) => {
                 return reader.original_position();
             }

src/primitives.rs

@@ -14,10 +14,12 @@
  */
 
 use std::boxed::Box;
-use std::error::Error;
 use std::fmt;
 use std::result;
 
+#[cfg(feature = "std")]
+use std::error::Error;
+
 #[derive(Debug, Copy, Clone)]
 pub struct BinaryReaderError {
     pub message: &'static str,
@@ -26,6 +28,7 @@ pub struct BinaryReaderError {
 
 pub type Result<T> = result::Result<T, BinaryReaderError>;
 
+#[cfg(feature = "std")]
 impl Error for BinaryReaderError {}
 
 impl fmt::Display for BinaryReaderError {

src/validator.rs

@@ -18,6 +18,7 @@ use std::cmp::min;
 use std::collections::HashSet;
 use std::result;
 use std::str;
+use std::string::String;
 use std::vec::Vec;
 
 use limits::{
@@ -2016,7 +2017,7 @@ impl<'a> ValidatingParser<'a> {
             }
             ParserState::ExportSectionEntry { field, kind, index } => {
                 self.validation_error = self.check_export_entry(field, kind, index).err();
-                self.exported_names.insert(field.to_string());
+                self.exported_names.insert(String::from(field));
             }
             ParserState::StartSectionEntry(func_index) => {
                 self.validation_error = self.check_start(func_index).err();