Skip to content

Commit

Permalink
Make the DocumentHelpers trait use extended_deref
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Zwarich committed Sep 27, 2014
1 parent 2789750 commit bad7915
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions components/script/dom/document.rs
Expand Up @@ -157,8 +157,8 @@ impl CollectionFilter for AppletsFilter {
}
}

pub trait DocumentHelpers {
fn url<'a>(&'a self) -> &'a Url;
pub trait DocumentHelpers<'a> {
fn url(self) -> &'a Url;
fn quirks_mode(self) -> QuirksMode;
fn set_quirks_mode(self, mode: QuirksMode);
fn set_last_modified(self, value: DOMString);
Expand All @@ -171,9 +171,9 @@ pub trait DocumentHelpers {
fn load_anchor_href(self, href: DOMString);
}

impl<'a> DocumentHelpers for JSRef<'a, Document> {
fn url<'a>(&'a self) -> &'a Url {
&*self.url
impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
fn url(self) -> &'a Url {
&*self.extended_deref().url
}

fn quirks_mode(self) -> QuirksMode {
Expand Down

5 comments on commit bad7915

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging zwarich/servo/extended-deref = bad7915 into bors-servo-integration-3497-extended-deref

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zwarich/servo/extended-deref = bad7915 merged ok, testing candidate = c109487

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to bors-servo-integration-3497-extended-deref = c109487

Please sign in to comment.