aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-09-22 14:06:23 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2017-09-22 14:18:25 +0200
commit860f2d806f9dd29b58b3ee92aebcdcd1211e2619 (patch)
tree02ad12fe76fc66f154f2b96f399a2f0654131b4b /components/script
parentdabecfade6e5e25f21cbf7e44d4e85793dfb89bc (diff)
downloadservo-860f2d806f9dd29b58b3ee92aebcdcd1211e2619.tar.gz
servo-860f2d806f9dd29b58b3ee92aebcdcd1211e2619.zip
Rename Promise::is_settled to Promise::is_fulfilled
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/promise.rs2
-rw-r--r--components/script/serviceworkerjob.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs
index 8baed5b5b69..e038d9ff4ca 100644
--- a/components/script/dom/promise.rs
+++ b/components/script/dom/promise.rs
@@ -187,7 +187,7 @@ impl Promise {
}
#[allow(unsafe_code)]
- pub fn is_settled(&self) -> bool {
+ pub fn is_fulfilled(&self) -> bool {
let state = unsafe { GetPromiseState(self.promise_obj()) };
match state {
PromiseState::Rejected | PromiseState::Fulfilled => true,
diff --git a/components/script/serviceworkerjob.rs b/components/script/serviceworkerjob.rs
index f9eddbb9af4..879b2b81e29 100644
--- a/components/script/serviceworkerjob.rs
+++ b/components/script/serviceworkerjob.rs
@@ -114,7 +114,7 @@ impl JobQueue {
} else {
// Step 2
let mut last_job = job_queue.pop().unwrap();
- if job == last_job && !last_job.promise.is_settled() {
+ if job == last_job && !last_job.promise.is_fulfilled() {
last_job.append_equivalent_job(job);
job_queue.push(last_job);
debug!("appended equivalent job");