Remove explicit lifetimes which can be elided.

39 files changed, 66 insertions, 66 deletions

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 739cc1ddb44..0097d70b9de 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -598,16 +598,16 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         }
     }
 
-    pub fn pipeline_details<'a>(&'a mut self,
+    pub fn pipeline_details (&mut self,
                                               pipeline_id: PipelineId)
-                                              -> &'a mut PipelineDetails {
+                                              -> &mut PipelineDetails {
         if !self.pipeline_details.contains_key(&pipeline_id) {
             self.pipeline_details.insert(pipeline_id, PipelineDetails::new());
         }
         return self.pipeline_details.get_mut(&pipeline_id).unwrap();
     }
 
-    pub fn pipeline<'a>(&'a self, pipeline_id: PipelineId) -> Option<&'a CompositionPipeline> {
+    pub fn pipeline(&self, pipeline_id: PipelineId) -> Option<&CompositionPipeline> {
         match self.pipeline_details.get(&pipeline_id) {
             Some(ref details) => details.pipeline.as_ref(),
             None => panic!("Compositor layer has an unknown pipeline ({:?}).", pipeline_id),
diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index b9e0a564b92..96d4b4b159a 100644
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@@ -381,10 +381,10 @@ pub trait Flow: fmt::Debug + Sync + Send + 'static {
 
 #[inline(always)]
 #[allow(unsafe_code)]
-pub fn base<'a, T: ?Sized + Flow>(this: &'a T) -> &'a BaseFlow {
+pub fn base<T: ?Sized + Flow>(this: &T) -> &BaseFlow {
     unsafe {
-        let obj = mem::transmute::<&&'a T, &'a raw::TraitObject>(&this);
-        mem::transmute::<*mut (), &'a BaseFlow>(obj.data)
+        let obj = mem::transmute::<&&T, &raw::TraitObject>(&this);
+        mem::transmute::<*mut (), &BaseFlow>(obj.data)
     }
 }
 
@@ -395,10 +395,10 @@ pub fn imm_child_iter<'a>(flow: &'a Flow) -> FlowListIterator<'a> {
 
 #[inline(always)]
 #[allow(unsafe_code)]
-pub fn mut_base<'a, T: ?Sized + Flow>(this: &'a mut T) -> &'a mut BaseFlow {
+pub fn mut_base<T: ?Sized + Flow>(this: &mut T) -> &mut BaseFlow {
     unsafe {
-        let obj = mem::transmute::<&&'a mut T, &'a raw::TraitObject>(&this);
-        mem::transmute::<*mut (), &'a mut BaseFlow>(obj.data)
+        let obj = mem::transmute::<&&mut T, &raw::TraitObject>(&this);
+        mem::transmute::<*mut (), &mut BaseFlow>(obj.data)
     }
 }
 
diff --git a/components/layout/flow_list.rs b/components/layout/flow_list.rs
index 7b66de47419..786cf4b5d63 100644
--- a/components/layout/flow_list.rs
+++ b/components/layout/flow_list.rs
@@ -24,27 +24,27 @@ pub struct MutFlowListIterator<'a> {
 impl FlowList {
     /// Provide a reference to the front element, or None if the list is empty
     #[inline]
-    pub fn front<'a>(&'a self) -> Option<&'a Flow> {
+    pub fn front(&self) -> Option<&Flow> {
         self.flows.front().map(|head| &**head)
     }
 
     /// Provide a mutable reference to the front element, or None if the list is empty
     #[inline]
     #[allow(unsafe_code)]
-    pub unsafe fn front_mut<'a>(&'a mut self) -> Option<&'a mut Flow> {
+    pub unsafe fn front_mut(&mut self) -> Option<&mut Flow> {
         self.flows.front_mut().map(flow_ref::deref_mut)
     }
 
     /// Provide a reference to the back element, or None if the list is empty
     #[inline]
-    pub fn back<'a>(&'a self) -> Option<&'a Flow> {
+    pub fn back(&self) -> Option<&Flow> {
         self.flows.back().map(|tail| &**tail)
     }
 
     /// Provide a mutable reference to the back element, or None if the list is empty
     #[inline]
     #[allow(unsafe_code)]
-    pub unsafe fn back_mut<'a>(&'a mut self) -> Option<&'a mut Flow> {
+    pub unsafe fn back_mut(&mut self) -> Option<&mut Flow> {
         self.flows.back_mut().map(flow_ref::deref_mut)
     }
 
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs
index d1717ef2000..b2dcc5c34fa 100644
--- a/components/layout/flow_ref.rs
+++ b/components/layout/flow_ref.rs
@@ -20,7 +20,7 @@ pub type WeakFlowRef = Weak<Flow>;
 /// See https://github.com/servo/servo/issues/6503
 /// Use Arc::get_mut instead when possible (e.g. on an Arc that was just created).
 #[allow(unsafe_code)]
-pub fn deref_mut<'a>(r: &'a mut FlowRef) -> &'a mut Flow {
+pub fn deref_mut<'a>(r: &mut FlowRef) -> &'a mut Flow {
     let ptr: *const Flow = &**r;
     unsafe {
         &mut *(ptr as *mut Flow)
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 3623e1c5d76..24fcd595f50 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -2387,7 +2387,7 @@ impl Fragment {
         }
     }
 
-    pub fn inline_styles<'a>(&'a self) -> InlineStyleIterator<'a> {
+    pub fn inline_styles(&self) -> InlineStyleIterator {
         InlineStyleIterator::new(self)
     }
 
@@ -2542,7 +2542,7 @@ impl<'a> Iterator for InlineStyleIterator<'a> {
 }
 
 impl<'a> InlineStyleIterator<'a> {
-    fn new<'b>(fragment: &'b Fragment) -> InlineStyleIterator<'b> {
+    fn new(fragment: &Fragment) -> InlineStyleIterator {
         InlineStyleIterator {
             fragment: fragment,
             inline_style_index: 0,
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index bc5987ae7f7..d45d3b154b1 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -65,7 +65,7 @@ impl<'a> GlobalRef<'a> {
 
     /// Extract a `Window`, causing task failure if the global object is not
     /// a `Window`.
-    pub fn as_window<'b>(&'b self) -> &'b window::Window {
+    pub fn as_window(&self) -> &window::Window {
         match *self {
             GlobalRef::Window(window) => window,
             GlobalRef::Worker(_) => panic!("expected a Window scope"),
@@ -189,7 +189,7 @@ impl<'a> GlobalRef<'a> {
 }
 
 impl<'a> Reflectable for GlobalRef<'a> {
-    fn reflector<'b>(&'b self) -> &'b Reflector {
+    fn reflector(&self) -> &Reflector {
         match *self {
             GlobalRef::Window(ref window) => window.reflector(),
             GlobalRef::Worker(ref worker) => worker.reflector(),
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 8fe2fee79c5..c29e3a2d2cc 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -260,12 +260,12 @@ impl Document {
     }
 
     // https://dom.spec.whatwg.org/#concept-document-url
-    pub fn url<'a>(&'a self) -> &'a Url {
+    pub fn url(&self) -> &Url {
         &self.url
     }
 
     // https://html.spec.whatwg.org/multipage/#fallback-base-url
-    pub fn fallback_base_url<'a>(&'a self) -> Url {
+    pub fn fallback_base_url(&self) -> Url {
         // Step 1: iframe srcdoc (#4767).
         // Step 2: about:blank with a creator browsing context.
         // Step 3.
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index a2970ffff1f..85b94de04d0 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -1507,7 +1507,7 @@ impl ElementMethods for Element {
 }
 
 impl VirtualMethods for Element {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let node: &Node = NodeCast::from_ref(self);
         Some(node as &VirtualMethods)
     }
@@ -1664,10 +1664,10 @@ impl<'a> ::selectors::Element for Root<Element> {
         false
     }
 
-    fn get_local_name<'b>(&'b self) -> &'b Atom {
+    fn get_local_name(&self) -> &Atom {
         self.local_name()
     }
-    fn get_namespace<'b>(&'b self) -> &'b Namespace {
+    fn get_namespace(&self) -> &Namespace {
         self.namespace()
     }
 
@@ -1768,16 +1768,16 @@ impl<'a> ::selectors::Element for Root<Element> {
 
 
 impl Element {
-    pub fn as_maybe_activatable<'a>(&'a self) -> Option<&'a (Activatable + 'a)> {
+    pub fn as_maybe_activatable(&self) -> Option<&Activatable> {
         let node = NodeCast::from_ref(self);
         let element = match node.type_id() {
             NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) => {
                 let element = HTMLInputElementCast::to_ref(self).unwrap();
-                Some(element as &'a (Activatable + 'a))
+                Some(element as &Activatable)
             },
             NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement)) => {
                 let element = HTMLAnchorElementCast::to_ref(self).unwrap();
-                Some(element as &'a (Activatable + 'a))
+                Some(element as &Activatable)
             },
             _ => {
                 None
@@ -1826,7 +1826,7 @@ impl Element {
     ///
     /// Use an element's synthetic click activation (or handle_event) for any script-triggered clicks.
     /// If the spec says otherwise, check with Manishearth first
-    pub fn authentic_click_activation<'b>(&self, event: &'b Event) {
+    pub fn authentic_click_activation(&self, event: &Event) {
         // Not explicitly part of the spec, however this helps enforce the invariants
         // required to save state between pre-activation and post-activation
         // since we cannot nest authentic clicks (unlike synthetic click activation, where
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index ee2887afa83..179e82917aa 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -318,7 +318,7 @@ impl EventTargetMethods for EventTarget {
 }
 
 impl VirtualMethods for EventTarget {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         None
     }
 }
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
index ca775b45672..4e2c396b88e 100644
--- a/components/script/dom/htmlanchorelement.rs
+++ b/components/script/dom/htmlanchorelement.rs
@@ -54,7 +54,7 @@ impl HTMLAnchorElement {
 }
 
 impl VirtualMethods for HTMLAnchorElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
@@ -113,7 +113,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
 }
 
 impl Activatable for HTMLAnchorElement {
-    fn as_element<'b>(&'b self) -> &'b Element {
+    fn as_element(&self) -> &Element {
         ElementCast::from_ref(self)
     }
 
diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs
index e01a03b5e47..d3ae9eb5bee 100644
--- a/components/script/dom/htmlappletelement.rs
+++ b/components/script/dom/htmlappletelement.rs
@@ -47,7 +47,7 @@ impl HTMLAppletElementMethods for HTMLAppletElement {
 }
 
 impl VirtualMethods for HTMLAppletElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         Some(HTMLElementCast::from_ref(self) as &VirtualMethods)
     }
 
diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs
index bb17cdb0ad3..d03e0045c8f 100644
--- a/components/script/dom/htmlareaelement.rs
+++ b/components/script/dom/htmlareaelement.rs
@@ -41,7 +41,7 @@ impl HTMLAreaElement {
 }
 
 impl VirtualMethods for HTMLAreaElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs
index 9fb36ae44d5..0708d16e2dd 100644
--- a/components/script/dom/htmlbaseelement.rs
+++ b/components/script/dom/htmlbaseelement.rs
@@ -60,7 +60,7 @@ impl HTMLBaseElement {
 }
 
 impl VirtualMethods for HTMLBaseElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         Some(HTMLElementCast::from_ref(self) as &VirtualMethods)
     }
 
diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
index 438aa79ec74..d2c0ddadcd3 100644
--- a/components/script/dom/htmlbodyelement.rs
+++ b/components/script/dom/htmlbodyelement.rs
@@ -122,7 +122,7 @@ impl HTMLBodyElement {
 }
 
 impl VirtualMethods for HTMLBodyElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let element: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(element as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
index 93f7f9b292a..27413ff78f8 100644
--- a/components/script/dom/htmlbuttonelement.rs
+++ b/components/script/dom/htmlbuttonelement.rs
@@ -134,7 +134,7 @@ impl HTMLButtonElementMethods for HTMLButtonElement {
 }
 
 impl VirtualMethods for HTMLButtonElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
@@ -188,7 +188,7 @@ impl VirtualMethods for HTMLButtonElement {
 impl FormControl for HTMLButtonElement {}
 
 impl<'a> Activatable for &'a HTMLButtonElement {
-    fn as_element<'b>(&'b self) -> &'b Element {
+    fn as_element(&self) -> &Element {
         ElementCast::from_ref(*self)
     }
 
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index 2fffe51134f..620c5749073 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -263,7 +263,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
 }
 
 impl VirtualMethods for HTMLCanvasElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let element: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(element as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index ae25eb3dc17..8760c8fd759 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -305,7 +305,7 @@ impl HTMLElement {
 }
 
 impl VirtualMethods for HTMLElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let element: &Element = ElementCast::from_ref(self);
         Some(element as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
index 2eb696affb8..731c498c61a 100644
--- a/components/script/dom/htmlfieldsetelement.rs
+++ b/components/script/dom/htmlfieldsetelement.rs
@@ -81,7 +81,7 @@ impl HTMLFieldSetElementMethods for HTMLFieldSetElement {
 }
 
 impl VirtualMethods for HTMLFieldSetElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs
index 1ab84f4b4d8..110c93a643a 100644
--- a/components/script/dom/htmlfontelement.rs
+++ b/components/script/dom/htmlfontelement.rs
@@ -70,7 +70,7 @@ impl HTMLFontElementMethods for HTMLFontElement {
 }
 
 impl VirtualMethods for HTMLFontElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 8fa12c02c6c..475252fa92e 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -218,7 +218,7 @@ impl HTMLFormElement {
             win.r().pipeline(), load_data)).unwrap();
     }
 
-    fn get_unclean_dataset<'a>(&self, submitter: Option<FormSubmitter<'a>>) -> Vec<FormDatum> {
+    fn get_unclean_dataset(&self, submitter: Option<FormSubmitter>) -> Vec<FormDatum> {
         let node = NodeCast::from_ref(self);
         // TODO: This is an incorrect way of getting controls owned
         //       by the form, but good enough until html5ever lands
@@ -256,7 +256,7 @@ impl HTMLFormElement {
         //       https://html.spec.whatwg.org/multipage/#the-directionality
     }
 
-    pub fn get_form_dataset<'a>(&self, submitter: Option<FormSubmitter<'a>>) -> Vec<FormDatum> {
+    pub fn get_form_dataset(&self, submitter: Option<FormSubmitter>) -> Vec<FormDatum> {
         fn clean_crlf(s: &str) -> DOMString {
             // https://html.spec.whatwg.org/multipage/#constructing-the-form-data-set
             // Step 4
@@ -515,7 +515,7 @@ pub trait FormControl: ElementBase + Reflectable {
 }
 
 impl VirtualMethods for HTMLFormElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         Some(HTMLElementCast::from_ref(self) as &VirtualMethods)
     }
 
diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs
index cc5d3d70562..1129d273927 100644
--- a/components/script/dom/htmlheadelement.rs
+++ b/components/script/dom/htmlheadelement.rs
@@ -36,7 +36,7 @@ impl HTMLHeadElement {
 }
 
 impl VirtualMethods for HTMLHeadElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 9e09e836d85..4f2149e346b 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -359,7 +359,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
 }
 
 impl VirtualMethods for HTMLIFrameElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 9e58d68a4e2..5ea8d2866be 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -298,7 +298,7 @@ impl HTMLImageElementMethods for HTMLImageElement {
 }
 
 impl VirtualMethods for HTMLImageElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 78ca2e3e726..b13a458f3d4 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -399,7 +399,7 @@ impl HTMLInputElement {
         }
     }
 
-    pub fn get_form_datum<'a>(&self, submitter: Option<FormSubmitter<'a>>) -> Option<FormDatum> {
+    pub fn get_form_datum(&self, submitter: Option<FormSubmitter>) -> Option<FormDatum> {
         let ty = self.Type();
         let name = self.Name();
         let is_submitter = match submitter {
@@ -491,7 +491,7 @@ impl HTMLInputElement {
 }
 
 impl VirtualMethods for HTMLInputElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
@@ -662,7 +662,7 @@ impl VirtualMethods for HTMLInputElement {
 impl FormControl for HTMLInputElement {}
 
 impl Activatable for HTMLInputElement {
-    fn as_element<'b>(&'b self) -> &'b Element {
+    fn as_element(&self) -> &Element {
         ElementCast::from_ref(self)
     }
 
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index 6f1dc148852..c939cbafc9c 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -88,7 +88,7 @@ fn is_favicon(value: &Option<String>) -> bool {
 }
 
 impl VirtualMethods for HTMLLinkElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs
index e70aee987b4..a4898e586c7 100644
--- a/components/script/dom/htmlmetaelement.rs
+++ b/components/script/dom/htmlmetaelement.rs
@@ -82,7 +82,7 @@ impl HTMLMetaElementMethods for HTMLMetaElement {
 }
 
 impl VirtualMethods for HTMLMetaElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs
index a2c435afbc1..8dd794f537d 100644
--- a/components/script/dom/htmlobjectelement.rs
+++ b/components/script/dom/htmlobjectelement.rs
@@ -91,7 +91,7 @@ impl HTMLObjectElementMethods for HTMLObjectElement {
 }
 
 impl VirtualMethods for HTMLObjectElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs
index cabb19936ab..c2ec85e8da6 100644
--- a/components/script/dom/htmloptgroupelement.rs
+++ b/components/script/dom/htmloptgroupelement.rs
@@ -49,7 +49,7 @@ impl HTMLOptGroupElementMethods for HTMLOptGroupElement {
 }
 
 impl VirtualMethods for HTMLOptGroupElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs
index b84fc43af34..b32cb7d8f11 100644
--- a/components/script/dom/htmloptionelement.rs
+++ b/components/script/dom/htmloptionelement.rs
@@ -142,7 +142,7 @@ impl HTMLOptionElementMethods for HTMLOptionElement {
 }
 
 impl VirtualMethods for HTMLOptionElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 579fe0c7c1b..994105f50b8 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -514,7 +514,7 @@ impl HTMLScriptElement {
 }
 
 impl VirtualMethods for HTMLScriptElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index 878bfe2538c..0ace753513d 100644
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -99,7 +99,7 @@ impl HTMLSelectElementMethods for HTMLSelectElement {
 }
 
 impl VirtualMethods for HTMLSelectElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index e26a59976e0..70556589681 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -63,7 +63,7 @@ impl HTMLStyleElement {
 }
 
 impl VirtualMethods for HTMLStyleElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs
index 1991d3ab3e8..2d017e0cb2b 100644
--- a/components/script/dom/htmltablecellelement.rs
+++ b/components/script/dom/htmltablecellelement.rs
@@ -98,7 +98,7 @@ impl HTMLTableCellElementLayoutHelpers for LayoutJS<HTMLTableCellElement> {
 }
 
 impl VirtualMethods for HTMLTableCellElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index 41568a55f10..6c94e4e79b5 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -143,7 +143,7 @@ impl HTMLTableElement {
 }
 
 impl VirtualMethods for HTMLTableElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs
index a35d5d79d66..81ceea4743c 100644
--- a/components/script/dom/htmltablerowelement.rs
+++ b/components/script/dom/htmltablerowelement.rs
@@ -96,7 +96,7 @@ impl HTMLTableRowElementMethods for HTMLTableRowElement {
 }
 
 impl VirtualMethods for HTMLTableRowElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs
index dfc2ceb5900..54af056b98b 100644
--- a/components/script/dom/htmltablesectionelement.rs
+++ b/components/script/dom/htmltablesectionelement.rs
@@ -81,7 +81,7 @@ impl HTMLTableSectionElementMethods for HTMLTableSectionElement {
 }
 
 impl VirtualMethods for HTMLTableSectionElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index ba46c064762..acedfec4444 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -236,7 +236,7 @@ impl HTMLTextAreaElement {
 }
 
 impl VirtualMethods for HTMLTextAreaElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs
index 06c8c356f6f..0ad9467c260 100644
--- a/components/script/dom/htmltitleelement.rs
+++ b/components/script/dom/htmltitleelement.rs
@@ -59,7 +59,7 @@ impl HTMLTitleElementMethods for HTMLTitleElement {
 }
 
 impl VirtualMethods for HTMLTitleElement {
-    fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
+    fn super_type(&self) -> Option<&VirtualMethods> {
         let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
         Some(htmlelement as &VirtualMethods)
     }
diff --git a/components/style/viewport.rs b/components/style/viewport.rs
index 0dc10e70052..226edda1fd9 100644
--- a/components/style/viewport.rs
+++ b/components/style/viewport.rs
@@ -38,7 +38,7 @@ pub enum ViewportDescriptor {
 }
 
 trait FromMeta: Sized {
-    fn from_meta<'a>(value: &'a str) -> Option<Self>;
+    fn from_meta (value: &str) -> Option<Self>;
 }
 
 // ViewportLength is a length | percentage | auto | extend-to-zoom
@@ -63,7 +63,7 @@ impl ToCss for ViewportLength {
 }
 
 impl FromMeta for ViewportLength {
-    fn from_meta<'a>(value: &'a str) -> Option<ViewportLength> {
+    fn from_meta(value: &str) -> Option<ViewportLength> {
         macro_rules! specified {
             ($value:expr) => {
                 ViewportLength::Specified(LengthOrPercentageOrAuto::Length($value))
@@ -276,7 +276,7 @@ impl ViewportRule {
         Ok(ViewportRule { declarations: valid_declarations.iter().cascade() })
     }
 
-    pub fn from_meta<'a>(content: &'a str) -> Option<ViewportRule> {
+    pub fn from_meta(content: &str) -> Option<ViewportRule> {
         let mut declarations = HashMap::new();
         macro_rules! push_descriptor {
             ($descriptor:ident($value:expr)) => {{