diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/crypto.rs | 8 | ||||
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 2 | ||||
-rwxr-xr-x | components/script/dom/htmlformelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/serviceworkerglobalscope.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 57b561e8a58..6c7fce6c8d1 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -12,23 +12,23 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::globalscope::GlobalScope; use js::jsapi::{JSContext, JSObject}; use js::jsapi::{JS_GetArrayBufferViewType, Type}; -use rand::{OsRng, Rng}; +use servo_rand::{ServoRng, Rng}; -unsafe_no_jsmanaged_fields!(OsRng); +unsafe_no_jsmanaged_fields!(ServoRng); // https://developer.mozilla.org/en-US/docs/Web/API/Crypto #[dom_struct] pub struct Crypto { reflector_: Reflector, #[ignore_heap_size_of = "Defined in rand"] - rng: DOMRefCell<OsRng>, + rng: DOMRefCell<ServoRng>, } impl Crypto { fn new_inherited() -> Crypto { Crypto { reflector_: Reflector::new(), - rng: DOMRefCell::new(OsRng::new().unwrap()), + rng: DOMRefCell::new(ServoRng::new()), } } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 911847aadb8..2d6f5ea14af 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -29,10 +29,10 @@ use js::rust::Runtime; use msg::constellation_msg::FrameId; use net_traits::{IpcSend, load_whole_resource}; use net_traits::request::{CredentialsMode, Destination, RequestInit, Type as RequestType}; -use rand::random; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, StackRootTLS, get_reports, new_rt_and_cx}; use script_runtime::ScriptThreadEventCategory::WorkerEvent; use script_traits::{TimerEvent, TimerSource, WorkerGlobalScopeInit, WorkerScriptLoadOrigin}; +use servo_rand::random; use servo_url::ServoUrl; use std::mem::replace; use std::sync::{Arc, Mutex}; diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index a0a34b081c8..b403b1389a8 100755 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -44,9 +44,9 @@ use html5ever_atoms::LocalName; use hyper::header::{Charset, ContentDisposition, ContentType, DispositionParam, DispositionType}; use hyper::method::Method; use msg::constellation_msg::PipelineId; -use rand::random; use script_thread::{MainThreadScriptMsg, Runnable}; use script_traits::LoadData; +use servo_rand::random; use std::borrow::ToOwned; use std::cell::Cell; use std::sync::mpsc::Sender; diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index 8dd3da01671..854a0ee0a75 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -25,10 +25,10 @@ use js::jsval::UndefinedValue; use js::rust::Runtime; use net_traits::{load_whole_resource, IpcSend, CustomResponseMediator}; use net_traits::request::{CredentialsMode, Destination, RequestInit, Type as RequestType}; -use rand::random; use script_runtime::{CommonScriptMsg, StackRootTLS, get_reports, new_rt_and_cx, ScriptChan}; use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorkerMsg, WorkerScriptLoadOrigin}; use servo_config::prefs::PREFS; +use servo_rand::random; use servo_url::ServoUrl; use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel}; use std::thread; |