Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refine a lifetime parameter on TElement's get_local_name

Browse source
This commit is contained in:
Cameron Zwarich 2014-09-30 20:49:35 -07:00
parent e894499c17
commit ccc5d976f7
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/wrapper.rs
View file

@ -395,12 +395,12 @@ impl<'le> LayoutElement<'le> {
impl<'le> TElement<'le> for LayoutElement<'le> {
#[inline]
fn get_local_name<'a>(&'a self) -> &'a Atom {
fn get_local_name(&self) -> &'le Atom {
&self.element.local_name
}
#[inline]
fn get_namespace<'a>(&'a self) -> &'a Namespace {
fn get_namespace(&self) -> &'le Namespace {
&self.element.namespace
}

4
components/script/dom/element.rs
View file

@ -965,7 +965,7 @@ impl<'a> style::TElement<'a> for JSRef<'a, Element> {
_ => None,
}
}
fn get_local_name<'b>(&'b self) -> &'b Atom {
fn get_local_name(&self) -> &'a Atom {
// FIXME(zwarich): Remove this when UFCS lands and there is a better way
// of disambiguating methods.
fn get_local_name<'a, T: ElementHelpers<'a>>(this: T) -> &'a Atom {
@ -974,7 +974,7 @@ impl<'a> style::TElement<'a> for JSRef<'a, Element> {
get_local_name(*self)
}
fn get_namespace<'b>(&'b self) -> &'b Namespace {
fn get_namespace(&self) -> &'a Namespace {
// FIXME(zwarich): Remove this when UFCS lands and there is a better way
// of disambiguating methods.
fn get_namespace<'a, T: ElementHelpers<'a>>(this: T) -> &'a Namespace {

4
components/style/node.rs
View file

@ -24,8 +24,8 @@ pub trait TNode<'a, E: TElement<'a>> : Clone {
pub trait TElement<'a> {
fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'a str>;
fn get_link(&self) -> Option<&'a str>;
fn get_local_name<'b>(&'b self) -> &'b Atom;
fn get_namespace<'b>(&'b self) -> &'b Namespace;
fn get_local_name(&self) -> &'a Atom;
fn get_namespace(&self) -> &'a Namespace;
fn get_hover_state(&self) -> bool;
fn get_id(&self) -> Option<Atom>;
fn get_disabled_state(&self) -> bool;