diff options
Diffstat (limited to 'components/script/dom/bindings')
| -rw-r--r-- | components/script/dom/bindings/buffer_source.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 10 | ||||
| -rw-r--r-- | components/script/dom/bindings/str.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/utils.rs | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/components/script/dom/bindings/buffer_source.rs b/components/script/dom/bindings/buffer_source.rs index a01a52d37c5..dd78186aee9 100644 --- a/components/script/dom/bindings/buffer_source.rs +++ b/components/script/dom/bindings/buffer_source.rs @@ -422,14 +422,13 @@ where } unsafe { - let mapping_slice_ptr = - mapping.lock().unwrap().borrow_mut()[offset as usize..m_end as usize].as_mut_ptr(); + let mapping_slice_ptr = mapping.lock().unwrap().borrow_mut()[offset..m_end].as_mut_ptr(); // rooted! is needed to ensure memory safety and prevent potential garbage collection issues. // https://github.com/mozilla-spidermonkey/spidermonkey-embedding-examples/blob/esr78/docs/GC%20Rooting%20Guide.md#performance-tweaking rooted!(in(*cx) let array_buffer = NewExternalArrayBuffer( *cx, - range_size as usize, + range_size, mapping_slice_ptr as _, Some(free_func), Arc::into_raw(mapping) as _, diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index 0c79b67134c..c33cbad479c 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -228,8 +228,8 @@ pub unsafe fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString let mut length = 0; let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), s, &mut length); assert!(!chars.is_null()); - let potentially_ill_formed_utf16 = slice::from_raw_parts(chars, length as usize); - let mut s = String::with_capacity(length as usize); + let potentially_ill_formed_utf16 = slice::from_raw_parts(chars, length); + let mut s = String::with_capacity(length); for item in char::decode_utf16(potentially_ill_formed_utf16.iter().cloned()) { match item { Ok(c) => s.push(c), @@ -282,7 +282,7 @@ impl FromJSValConvertible for USVString { let mut length = 0; let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), jsstr, &mut length); assert!(!chars.is_null()); - let char_vec = slice::from_raw_parts(chars as *const u16, length as usize); + let char_vec = slice::from_raw_parts(chars as *const u16, length); Ok(ConversionResult::Success(USVString( String::from_utf16_lossy(char_vec), ))) @@ -324,7 +324,7 @@ impl FromJSValConvertible for ByteString { let chars = JS_GetLatin1StringCharsAndLength(cx, ptr::null(), string, &mut length); assert!(!chars.is_null()); - let char_slice = slice::from_raw_parts(chars as *mut u8, length as usize); + let char_slice = slice::from_raw_parts(chars as *mut u8, length); return Ok(ConversionResult::Success(ByteString::new( char_slice.to_vec(), ))); @@ -332,7 +332,7 @@ impl FromJSValConvertible for ByteString { let mut length = 0; let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), string, &mut length); - let char_vec = slice::from_raw_parts(chars, length as usize); + let char_vec = slice::from_raw_parts(chars, length); if char_vec.iter().any(|&c| c > 0xFF) { throw_type_error(cx, "Invalid ByteString"); diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index 8fc1ce4591b..ae0e1f585a7 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -776,7 +776,7 @@ fn max_day_in_month(year_num: i32, month_num: u32) -> Option<u32> { /// <https://html.spec.whatwg.org/multipage/#week-number-of-the-last-day> fn max_week_in_year(year: i32) -> u32 { - Utc.with_ymd_and_hms(year as i32, 1, 1, 0, 0, 0) + Utc.with_ymd_and_hms(year, 1, 1, 0, 0, 0) .earliest() .map(|date_time| match date_time.weekday() { Weekday::Thu => 53, diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index adfd9017037..402b60fc2b6 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -451,7 +451,7 @@ pub unsafe extern "C" fn resolve_global( let mut length = 0; let ptr = JS_GetLatin1StringCharsAndLength(cx, ptr::null(), string, &mut length); assert!(!ptr.is_null()); - let bytes = slice::from_raw_parts(ptr, length as usize); + let bytes = slice::from_raw_parts(ptr, length); if let Some(init_fun) = InterfaceObjectMap::MAP.get(bytes) { init_fun(SafeJSContext::from_ptr(cx), Handle::from_raw(obj)); |