aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_module.rs
diff options
context:
space:
mode:
authorSudarsan <sudar.theone@gmail.com>2020-08-28 20:54:18 +0800
committerSudarsan <sudar.theone@gmail.com>2020-08-28 20:54:18 +0800
commitf8c9ee4eff1ae7a72037e16f2aa97ad6bb69da4e (patch)
treee6c9d62ef7eab4920efe4c9e7bd5d3e603ef90e1 /components/script/script_module.rs
parent9e6da58d7793a4576fef38446457e1073a19cd5e (diff)
downloadservo-f8c9ee4eff1ae7a72037e16f2aa97ad6bb69da4e.tar.gz
servo-f8c9ee4eff1ae7a72037e16f2aa97ad6bb69da4e.zip
Update mozjs to 0.14.1
This update pulls in improvements on mozjs that now removes the need to pass pointers to CompileOptionsWraper::new(), allows NewProxyObject to now accept a Singleton bool and JSClass and removes an unsafe Handle::new usage.
Diffstat (limited to 'components/script/script_module.rs')
-rw-r--r--components/script/script_module.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs
index 9d8e14f8309..7a14410ab66 100644
--- a/components/script/script_module.rs
+++ b/components/script/script_module.rs
@@ -70,7 +70,6 @@ use net_traits::{FetchResponseListener, NetworkError};
use net_traits::{ResourceFetchTiming, ResourceTimingType};
use servo_url::ServoUrl;
use std::collections::{HashMap, HashSet};
-use std::ffi;
use std::mem;
use std::rc::Rc;
use std::str::FromStr;
@@ -420,12 +419,11 @@ impl ModuleTree {
url: ServoUrl,
options: ScriptFetchOptions,
) -> Result<ModuleObject, RethrowError> {
- let url_cstr = ffi::CString::new(url.as_str().as_bytes()).unwrap();
let _ac = JSAutoRealm::new(*global.get_cx(), *global.reflector().get_jsobject());
let compile_options =
- unsafe { CompileOptionsWrapper::new(*global.get_cx(), url_cstr.as_ptr(), 1) };
+ unsafe { CompileOptionsWrapper::new(*global.get_cx(), url.as_str(), 1) };
unsafe {
rooted!(in(*global.get_cx()) let mut module_script = CompileModuleDontInflate(