diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2015-09-04 09:02:12 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-09-04 09:02:12 +0530 |
commit | 2e02ea38fca44aaa5fe23e524bf27f667b300ada (patch) | |
tree | 0658fd6d9d7784cb0fb7c64b466b1ec44fd00503 | |
parent | 54c036cd66f6c9a59610fb804d57a63ab7aad19f (diff) | |
download | servo-2e02ea38fca44aaa5fe23e524bf27f667b300ada.tar.gz servo-2e02ea38fca44aaa5fe23e524bf27f667b300ada.zip |
Elide most 'b lifetimes
-rw-r--r-- | components/layout/fragment.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bindings/global.rs | 2 | ||||
-rw-r--r-- | components/script/dom/eventdispatcher.rs | 4 | ||||
-rw-r--r-- | components/script/dom/htmlinputelement.rs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index c11d9170679..fe826dfdaf2 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1224,7 +1224,7 @@ impl Fragment { } #[inline(always)] - pub fn style<'a>(&'a self) -> &'a ComputedValues { + pub fn style(&self) -> &ComputedValues { &*self.style } diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs index ef9e8ef82c9..f968305e08b 100644 --- a/components/script/dom/bindings/global.rs +++ b/components/script/dom/bindings/global.rs @@ -204,7 +204,7 @@ impl<'a> Reflectable for GlobalRef<'a> { impl GlobalRoot { /// Obtain a safe reference to the global object that cannot outlive the /// lifetime of this root. - pub fn r<'c>(&'c self) -> GlobalRef<'c> { + pub fn r(&self) -> GlobalRef { match *self { GlobalRoot::Window(ref window) => GlobalRef::Window(window.r()), GlobalRoot::Worker(ref worker) => GlobalRef::Worker(worker.r()), diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs index 7c5d06ab807..fba40538548 100644 --- a/components/script/dom/eventdispatcher.rs +++ b/components/script/dom/eventdispatcher.rs @@ -13,8 +13,8 @@ use dom::node::Node; use dom::virtualmethods::vtable_for; // See https://dom.spec.whatwg.org/#concept-event-dispatch for the full dispatch algorithm -pub fn dispatch_event<'b>(target: &EventTarget, - pseudo_target: Option<&'b EventTarget>, +pub fn dispatch_event(target: &EventTarget, + pseudo_target: Option<&EventTarget>, event: &Event) -> bool { assert!(!event.dispatching()); assert!(event.initialized()); diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 7aa1c13acf4..8cd6ae29cd8 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -356,8 +356,8 @@ fn broadcast_radio_checked(broadcaster: &HTMLInputElement, group: Option<&str>) do_broadcast(doc_node, broadcaster, owner.r(), group) } -fn in_same_group<'b>(other: &HTMLInputElement, - owner: Option<&'b HTMLFormElement>, +fn in_same_group(other: &HTMLInputElement, + owner: Option<&HTMLFormElement>, group: Option<&str>) -> bool { let other_owner = other.form_owner(); let other_owner = other_owner.r(); |