Skip to content

Commit 2210d3f

Browse files
Merge pull request #82 from hansl/usize-is-usize
Since the bindings all use `usize` dont discriminate between 64 and 32 bits
2 parents 90dc1fe + f40c646 commit 2210d3f

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

src/quickjs_utils/typedarrays.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ pub unsafe fn new_array_buffer(
7575
) -> Result<QuickJsValueAdapter, JsError> {
7676
log::trace!("new_array_buffer");
7777

78-
#[cfg(target_pointer_width = "64")]
79-
let length = buf.len();
80-
#[cfg(target_pointer_width = "32")]
81-
let length = buf.len() as u32;
78+
let length: usize = buf.len();
8279

8380
let (buffer_id, buffer_ptr) = BUFFERS.with(|rc| {
8481
let buffers = &mut *rc.borrow_mut();
@@ -160,10 +157,7 @@ pub unsafe fn new_array_buffer_copy(
160157
) -> Result<QuickJsValueAdapter, JsError> {
161158
log::trace!("new_array_buffer_copy");
162159

163-
#[cfg(target_pointer_width = "64")]
164-
let length = buf.len();
165-
#[cfg(target_pointer_width = "32")]
166-
let length = buf.len() as u32;
160+
let length: usize = buf.len();
167161

168162
let raw = q::JS_NewArrayBufferCopy(ctx, buf.as_ptr(), length);
169163
let obj_ref = QuickJsValueAdapter::new(
@@ -213,10 +207,7 @@ pub unsafe fn detach_array_buffer_buffer(
213207
buffers.remove(&id)
214208
})
215209
} else {
216-
#[cfg(target_pointer_width = "64")]
217210
let mut len: usize = 0;
218-
#[cfg(target_pointer_width = "32")]
219-
let mut len: u32 = 0;
220211

221212
let ptr = q::JS_GetArrayBuffer(ctx, &mut len, *array_buffer.borrow_value());
222213

@@ -265,10 +256,7 @@ pub unsafe fn get_array_buffer_buffer_copy(
265256
});
266257
Ok(b)
267258
} else {
268-
#[cfg(target_pointer_width = "64")]
269259
let mut len: usize = 0;
270-
#[cfg(target_pointer_width = "32")]
271-
let mut len: u32 = 0;
272260

273261
let ptr = q::JS_GetArrayBuffer(ctx, &mut len, *array_buffer.borrow_value());
274262

0 commit comments

Comments
 (0)