mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Merge pull request #743 from RustPython/coolreader18/update-deps

Browse Source 
Update cargo dependencies
This commit is contained in:
coolreader18
2019-03-28 11:16:21 -04:00
committed by GitHub
parent e048037146 b621a13415
commit e1865fed82
2 changed files with 396 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

718
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

17
wasm/lib/src/convert.rs
View File

@@ -125,12 +125,14 @@ pub fn py_to_js(vm: &VirtualMachine, py_obj: PyObjectRef) -> JsValue {
|| objtype::isinstance(&py_obj, &vm.ctx.bytearray_type())
{
let bytes = objbytes::get_value(&py_obj);
let arr = Uint8Array::new_with_length(bytes.len() as u32);
for (i, byte) in bytes.iter().enumerate() {
Reflect::set(&arr, &(i as u32).into(), &(*byte).into())
.expect("setting Uint8Array value failed");
unsafe {
// `Uint8Array::view` is an `unsafe fn` because it provides
// a direct view into the WASM linear memory; if you were to allocate
// something with Rust that view would probably become invalid. It's safe
// because we then copy the array using `Uint8Array::slice`.
let view = Uint8Array::view(&bytes);
view.slice(0, bytes.len() as u32).into()
}
arr.into()
} else {
match vm.serialize(&py_obj) {
Ok(json) => js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED),
@@ -182,9 +184,8 @@ pub fn js_to_py(vm: &VirtualMachine, js_val: JsValue) -> PyObjectRef {
.cloned()
.unwrap_or_else(|| js_val.unchecked_ref::<Uint8Array>().buffer()),
);
let mut vec = Vec::with_capacity(u8_array.length() as usize);
// TODO: use Uint8Array::copy_to once updating js_sys doesn't break everything
u8_array.for_each(&mut |byte, _, _| vec.push(byte));
let mut vec = vec![0; u8_array.length() as usize];
u8_array.copy_to(&mut vec);
vm.ctx.new_bytes(vec)
} else {
let dict = vm.ctx.new_dict();