fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-16 18:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #469 from alexcrichton/less-nightly

Browse Source 
Remove usage of the `try_reserve` nightly feature
This commit is contained in:
Nick Fitzgerald 2018-07-13 11:26:53 -07:00 committed by GitHub
commit ee1d4ba9ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib.rs
View File

@ -5,7 +5,7 @@
//! this crate and this crate also provides JS bindings through the `JsValue`
//! interface.
#![feature(use_extern_macros, wasm_import_module, try_reserve, unsize)]
#![feature(use_extern_macros, wasm_import_module, unsize)]
#![cfg_attr(feature = "js_globals", feature(proc_macro, wasm_custom_section))]
#![no_std]
@ -661,24 +661,29 @@ pub mod __rt {
}
if_std! {
use std::prelude::v1::*;
use std::alloc::{System, GlobalAlloc, Layout};
use std::mem;
#[no_mangle]
pub extern fn __wbindgen_malloc(size: usize) -> *mut u8 {
use core::mem;
let mut ret = Vec::new();
if ret.try_reserve_exact(size).is_err() {
super::throw("invalid malloc request");
let align = mem::align_of::<usize>();
if let Ok(layout) = Layout::from_size_align(size, align) {
unsafe {
let ptr = System.alloc(layout);
if !ptr.is_null() {
return ptr
}
}
}
let ptr = ret.as_mut_ptr();
mem::forget(ret);
return ptr
super::throw("invalid malloc request");
}
#[no_mangle]
pub unsafe extern fn __wbindgen_free(ptr: *mut u8, size: usize) {
drop(Vec::<u8>::from_raw_parts(ptr, 0, size));
let align = mem::align_of::<usize>();
let layout = Layout::from_size_align_unchecked(size, align);
System.dealloc(ptr, layout);
}
}