aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/element.rs4
-rw-r--r--components/script/dom/htmlcollection.rs2
-rw-r--r--components/script/dom/progressevent.rs6
-rw-r--r--components/script/dom/testbindingproxy.rs14
-rw-r--r--components/script/dom/xmlhttprequest.rs2
-rw-r--r--components/script/timers.rs4
6 files changed, 16 insertions, 16 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 83b7c24ed3a..4e03dff4086 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -1867,10 +1867,10 @@ impl Element {
}
}
// Step 6
- None => {event.fire(target);}
+ None => { event.fire(target); }
},
// Step 6
- None => {event.fire(target);}
+ None => { event.fire(target); }
}
// Step 7
self.set_click_in_progress(false);
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs
index 6aee8645ad8..ad16e70afa2 100644
--- a/components/script/dom/htmlcollection.rs
+++ b/components/script/dom/htmlcollection.rs
@@ -64,7 +64,7 @@ impl HTMLCollection {
}
}
}
- let filter = AllElementFilter {namespace_filter: namespace_filter};
+ let filter = AllElementFilter { namespace_filter: namespace_filter };
HTMLCollection::create(window, root, box filter)
}
diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs
index 88a369606ae..b715330edae 100644
--- a/components/script/dom/progressevent.rs
+++ b/components/script/dom/progressevent.rs
@@ -52,9 +52,9 @@ impl ProgressEvent {
type_: DOMString,
init: &ProgressEventBinding::ProgressEventInit)
-> Fallible<Root<ProgressEvent>> {
- let bubbles = if init.parent.bubbles {EventBubbles::Bubbles} else {EventBubbles::DoesNotBubble};
- let cancelable = if init.parent.cancelable {EventCancelable::Cancelable}
- else {EventCancelable::NotCancelable};
+ let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
+ let cancelable = if init.parent.cancelable { EventCancelable::Cancelable }
+ else { EventCancelable::NotCancelable };
let ev = ProgressEvent::new(global, type_, bubbles, cancelable,
init.lengthComputable, init.loaded, init.total);
Ok(ev)
diff --git a/components/script/dom/testbindingproxy.rs b/components/script/dom/testbindingproxy.rs
index 3c1f23c8ae1..5ca27eae735 100644
--- a/components/script/dom/testbindingproxy.rs
+++ b/components/script/dom/testbindingproxy.rs
@@ -15,20 +15,20 @@ pub struct TestBindingProxy {
}
impl TestBindingProxyMethods for TestBindingProxy {
- fn Length(&self) -> u32 {0}
- fn SupportedPropertyNames(&self) -> Vec<DOMString> {vec![]}
- fn GetNamedItem(&self, _: DOMString) -> DOMString {"".to_owned()}
+ fn Length(&self) -> u32 { 0 }
+ fn SupportedPropertyNames(&self) -> Vec<DOMString> { vec![] }
+ fn GetNamedItem(&self, _: DOMString) -> DOMString { "".to_owned() }
fn SetNamedItem(&self, _: DOMString, _: DOMString) -> () {}
- fn GetItem(&self, _: u32) -> DOMString {"".to_owned()}
+ fn GetItem(&self, _: u32) -> DOMString { "".to_owned() }
fn SetItem(&self, _: u32, _: DOMString) -> () {}
fn RemoveItem(&self, _: DOMString) -> () {}
- fn Stringifier(&self) -> DOMString {"".to_owned()}
+ fn Stringifier(&self) -> DOMString { "".to_owned() }
fn NamedCreator(&self, _: DOMString, _: DOMString) -> () {}
- fn IndexedGetter(&self, _: u32, _: &mut bool) -> DOMString {"".to_owned()}
+ fn IndexedGetter(&self, _: u32, _: &mut bool) -> DOMString { "".to_owned() }
fn NamedDeleter(&self, _: DOMString) -> () {}
fn IndexedSetter(&self, _: u32, _: DOMString) -> () {}
fn NamedSetter(&self, _: DOMString, _: DOMString) -> () {}
fn IndexedCreator(&self, _: u32, _: DOMString) -> () {}
- fn NamedGetter(&self, _: DOMString, _: &mut bool) -> DOMString {"".to_owned()}
+ fn NamedGetter(&self, _: DOMString, _: &mut bool) -> DOMString { "".to_owned() }
}
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 1d7a097fd9e..0f08ef9ec11 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -959,7 +959,7 @@ impl XMLHttpRequest {
fn dispatch_response_progress_event(&self, type_: DOMString) {
let len = self.response.borrow().len() as u64;
- let total = self.response_headers.borrow().get::<ContentLength>().map(|x| {**x as u64});
+ let total = self.response_headers.borrow().get::<ContentLength>().map(|x| { **x as u64 });
self.dispatch_progress_event(false, type_, len, total);
}
fn set_timeout(&self, duration_ms: u32) {
diff --git a/components/script/timers.rs b/components/script/timers.rs
index f18b2231417..8fd712e7ac6 100644
--- a/components/script/timers.rs
+++ b/components/script/timers.rs
@@ -183,7 +183,7 @@ impl TimerManager {
if is_interval == IsInterval::NonInterval {
break;
}
- } else if id == control_handle.id() {;
+ } else if id == control_handle.id() {
match control_port.recv().unwrap() {
TimerControlMsg::Suspend => {
let msg = control_port.recv().unwrap();
@@ -194,7 +194,7 @@ impl TimerManager {
break;
},
}
- },
+ },
TimerControlMsg::Resume => panic!("Nothing to resume!"),
TimerControlMsg::Cancel => {
break;