Merge pull request #15 from fitzgen/fix-warnings-and-incorrect-size-in-from-raw-parts

Fix warnings and incorrect size in from raw parts

Author: fitzgen

Cargo.toml

@@ -18,14 +18,14 @@ license = "Apache-2.0/MIT"
 name = "source-map-mappings"
 readme = "./README.md"
 repository = "https://github.com/fitzgen/source-map-mappings"
-version = "0.3.0"
+version = "0.4.0"
 
 [badges.travis-ci]
 repository = "fitzgen/source-map-mappings"
 
 [dependencies]
 rand = "0.4.1"
-vlq = "0.5"
+vlq = "0.5.1"
 
 [dev-dependencies]
 quickcheck = "0.5.0"

source-map-mappings-wasm-api/Cargo.toml

@@ -5,13 +5,13 @@ license = "Apache-2.0/MIT"
 name = "source-map-mappings-wasm-api"
 readme = "../README.md"
 repository = "https://github.com/fitzgen/source-map-mappings"
-version = "0.3.0"
+version = "0.4.0"
 
 [badges.travis-ci]
 repository = "fitzgen/source-map-mappings"
 
 [dependencies]
-source-map-mappings = { version = "0.3.0", path = ".." }
+source-map-mappings = { version = "0.4.0", path = ".." }
 
 [features]
 profiling = []

source-map-mappings-wasm-api/src/lib.rs

@@ -215,8 +215,9 @@ pub extern "C" fn parse_mappings(mappings: *mut u8) -> *mut Mappings<Observer> {
  };
 
  // Deallocate the mappings string and its two prefix words.
+ let size_in_usizes = (size + mem::size_of::<usize>() - 1) / mem::size_of::<usize>();
  unsafe {
- Vec::<usize>::from_raw_parts(capacity_ptr, size, capacity);
+ Vec::<usize>::from_raw_parts(capacity_ptr, size_in_usizes + 2, capacity);
  }
 
  // Return the result, saving any errors on the side for later inspection by

src/lib.rs

@@ -53,13 +53,11 @@ pub mod sort;
 
 use sort::quick_sort;
 use std::cmp;
-use std::process;
 use std::slice;
 use std::u32;
 
 /// Errors that can occur during parsing.
 #[derive(Copy, Clone, Debug)]
-#[repr(C)]
 #[repr(u32)]
 pub enum Error {
  // NB: 0 is reserved for OK.
@@ -95,7 +93,6 @@ impl From<vlq::Error> for Error {
 /// When doing fuzzy searching, whether to slide the next larger or next smaller
 /// mapping from the queried location.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-#[repr(C)]
 #[repr(u32)]
 pub enum Bias {
  // XXX: make sure these values always match `mozilla/source-map`'s
@@ -175,6 +172,7 @@ fn unwrap<T>(o: Option<T>) -> T {
 #[cfg(not(debug_assertions))]
 #[inline]
 fn unwrap<T>(o: Option<T>) -> T {
+ use std::process;
  match o {
  Some(t) => t,
  None => process::abort(),