aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_module.rs
diff options
context:
space:
mode:
authorCYBAI <cyb.ai.815@gmail.com>2020-01-06 15:29:01 +0800
committerCYBAI <cyb.ai.815@gmail.com>2020-01-06 15:29:01 +0800
commitb8c6b55c98df105fe4a19aaa1c950f571f3afa07 (patch)
tree32de6ddb06d3d718da81d8603c8af7c8ebb2af03 /components/script/script_module.rs
parent9460b43f905aa5533b4650c93af8125a06f0516b (diff)
downloadservo-b8c6b55c98df105fe4a19aaa1c950f571f3afa07.tar.gz
servo-b8c6b55c98df105fe4a19aaa1c950f571f3afa07.zip
Remove redundant checking of promise resolve and clone of URLs
Diffstat (limited to 'components/script/script_module.rs')
-rw-r--r--components/script/script_module.rs24
1 files changed, 4 insertions, 20 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs
index 959eee193d0..c9352463ab3 100644
--- a/components/script/script_module.rs
+++ b/components/script/script_module.rs
@@ -1143,18 +1143,14 @@ pub fn fetch_single_module_script(
let global = owner.global();
let module_map = global.get_module_map().borrow();
- debug!("Start to fetch {}", url.clone());
+ debug!("Start to fetch {}", url);
if let Some(module_tree) = module_map.get(&url.clone()) {
let status = module_tree.get_status();
let promise = module_tree.get_promise().borrow();
- debug!(
- "Meet a fetched url {} and its status is {:?}",
- url.clone(),
- status
- );
+ debug!("Meet a fetched url {} and its status is {:?}", url, status);
assert!(promise.is_some());
@@ -1170,24 +1166,12 @@ pub fn fetch_single_module_script(
ModuleStatus::Fetching => return promise.clone(),
ModuleStatus::FetchingDescendants => {
if module_tree.has_all_ready_descendants(&module_map) {
- let module_error = module_tree.get_error().borrow();
-
- if module_error.is_some() {
- promise.resolve_native(&());
- } else {
- promise.resolve_native(&());
- }
+ promise.resolve_native(&());
}
},
// Step 3.
ModuleStatus::FetchFailed | ModuleStatus::Ready | ModuleStatus::Finished => {
- let module_error = module_tree.get_error().borrow();
-
- if module_error.is_some() {
- promise.resolve_native(&());
- } else {
- promise.resolve_native(&());
- }
+ promise.resolve_native(&());
},
}