Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

migrate use of deprecated RUST_JS_{IS,TO}_STRING

Browse source
This commit is contained in:
Delan Azabani 2023-03-03 21:00:44 +08:00
parent 8814e4bb4f
commit 9a3d6969c9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/window_named_properties.rs
View file

@ -11,8 +11,7 @@ use crate::dom::window::Window;
use crate::js::conversions::ToJSValConvertible; use crate::js::conversions::ToJSValConvertible;
use crate::script_runtime::JSContext as SafeJSContext; use crate::script_runtime::JSContext as SafeJSContext;
use js::conversions::jsstr_to_string; use js::conversions::jsstr_to_string;
use js::glue::RUST_JSID_TO_STRING; use js::glue::{CreateProxyHandler, NewProxyObject, ProxyTraps};
use js::glue::{CreateProxyHandler, NewProxyObject, ProxyTraps, RUST_JSID_IS_STRING};
use js::jsapi::JS_SetImmutablePrototype; use js::jsapi::JS_SetImmutablePrototype;
use js::jsapi::{ use js::jsapi::{
Handle, HandleObject, JSClass, JSContext, JSErrNum, MutableHandleObject, UndefinedHandleValue, Handle, HandleObject, JSClass, JSContext, JSErrNum, MutableHandleObject, UndefinedHandleValue,
@ -85,7 +84,7 @@ unsafe extern "C" fn get_own_property_descriptor(
is_none: *mut bool, is_none: *mut bool,
) -> bool { ) -> bool {
let cx = SafeJSContext::from_ptr(cx); let cx = SafeJSContext::from_ptr(cx);
if !RUST_JSID_IS_STRING(id) { if !id.is_string() {
// Nothing to do if we're resolving a non-string property. // Nothing to do if we're resolving a non-string property.
return true; return true;
} }
@ -103,7 +102,7 @@ unsafe extern "C" fn get_own_property_descriptor(
return true; return true;
} }
let s = jsstr_to_string(*cx, RUST_JSID_TO_STRING(id)); let s = jsstr_to_string(*cx, id.to_string());
if s.is_empty() { if s.is_empty() {
return true; return true;
} }