mirror of
https://github.com/servo/servo.git
synced 2025-09-27 23:30:08 +01:00
bump mozjs to 137.0-1 (#38561)
This bump downgrades icu_capi to 1.5.0, to match the version vendored in spidermonkey. Previous mozjs PRs: - https://github.com/servo/mozjs/pull/606 - https://github.com/servo/mozjs/pull/605 Testing: Covered by existing tests --------- Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
parent
d33ae1549d
commit
ff4971012f
4 changed files with 13 additions and 12 deletions
|
@ -3,6 +3,7 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::ptr;
|
||||
use std::ptr::NonNull;
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use js::conversions::jsstr_to_string;
|
||||
|
@ -115,7 +116,7 @@ unsafe extern "C" fn get_own_property_descriptor(
|
|||
}
|
||||
|
||||
let s = if id.is_string() {
|
||||
unsafe { jsstr_to_string(*cx, id.to_string()) }
|
||||
unsafe { jsstr_to_string(*cx, NonNull::new(id.to_string()).unwrap()) }
|
||||
} else if id.is_int() {
|
||||
// If the property key is an integer index, convert it to a String too.
|
||||
// For indexed access on the window object, which may shadow this, see
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue