aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelias <elias.jm.garcia@gmail.com>2019-03-13 11:39:14 -0500
committerelias <elias.jm.garcia@gmail.com>2019-03-14 14:10:29 -0500
commitbe82d7c9058cd22c54b01a4b6aa0858307364f6c (patch)
treef1b5a25dff8b2b16d3070d6f8e26aa3a3877259c
parentc713febe7a43695e5e43762c188f5baf62282687 (diff)
downloadservo-be82d7c9058cd22c54b01a4b6aa0858307364f6c.tar.gz
servo-be82d7c9058cd22c54b01a4b6aa0858307364f6c.zip
ran ./mach fmt
- removed unused import in document_loader.rs - limit unsafe block in mark_document_with_no_blocked_loads in script_thread.rs - changed name of if let value to load in Drop for LoadBlocker in document_loader.rs
-rw-r--r--components/script/document_loader.rs5
-rw-r--r--components/script/script_thread.rs6
2 files changed, 5 insertions, 6 deletions
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs
index f9f31811d94..dac891053d7 100644
--- a/components/script/document_loader.rs
+++ b/components/script/document_loader.rs
@@ -14,7 +14,6 @@ use net_traits::request::RequestInit;
use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg};
use net_traits::{IpcSend, ResourceThreads};
use servo_url::ServoUrl;
-use std::thread;
#[derive(Clone, Debug, JSTraceable, MallocSizeOf, PartialEq)]
pub enum LoadType {
@@ -77,8 +76,8 @@ impl LoadBlocker {
impl Drop for LoadBlocker {
fn drop(&mut self) {
- if let Some(script_thread) = self.load.take() {
- self.doc.finish_load(script_thread);
+ if let Some(load) = self.load.take() {
+ self.doc.finish_load(load);
}
}
}
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index b3bd5b1c396..41a7192e70a 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -809,13 +809,13 @@ impl ScriptThread {
pub fn mark_document_with_no_blocked_loads(doc: &Document) {
SCRIPT_THREAD_ROOT.with(|root| {
- unsafe {
if let Some(script_thread) = root.get() {
- (*script_thread)
+ let script_thread = unsafe { &*script_thread };
+ script_thread
.docs_with_no_blocking_loads
.borrow_mut()
.insert(Dom::from_ref(doc));
- }}
+ }
})
}