aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmllinkelement.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-04-27 23:14:25 -0500
committerbors-servo <metajack+bors@gmail.com>2015-04-27 23:14:25 -0500
commitd7987e43c944eb9b156bf3244c08fce4cb570db4 (patch)
tree981a01b544e1c3f2a57fb003ade762093e981aa1 /components/script/dom/htmllinkelement.rs
parent8ecb9d681c385995b082d67874fdfa7f1e929e1f (diff)
parent369a568264f8c9095681f2fee5c6bad03f312cbc (diff)
downloadservo-d7987e43c944eb9b156bf3244c08fce4cb570db4.tar.gz
servo-d7987e43c944eb9b156bf3244c08fce4cb570db4.zip
Auto merge of #5855 - Manishearth:nomove, r=kmc,munksgaard
fixes #5724, #5737 uses https://github.com/Manishearth/rust-tenacious (can be moved in-tree if needed) I can make it `Deny` by default too (I'll add a cargo feature to tenacious), though we might want it on `Warn` until we get some mileage on it. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5855) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmllinkelement.rs')
-rw-r--r--components/script/dom/htmllinkelement.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index 0a415c8d0be..60e78b5bdad 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -9,7 +9,7 @@ use dom::bindings::codegen::Bindings::HTMLLinkElementBinding::HTMLLinkElementMet
use dom::bindings::codegen::InheritTypes::HTMLLinkElementDerived;
use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCast};
use dom::bindings::js::{JS, JSRef, MutNullableHeap, Temporary};
-use dom::bindings::js::OptionalRootable;
+use dom::bindings::js::{OptionalRootable, RootedReference};
use dom::document::Document;
use dom::domtokenlist::DOMTokenList;
use dom::element::{AttributeHandlers, Element};
@@ -60,9 +60,7 @@ impl HTMLLinkElement {
fn get_attr(element: JSRef<Element>, local_name: &Atom) -> Option<String> {
let elem = element.get_attribute(&ns!(""), local_name).root();
- elem.map(|e| {
- // FIXME(https://github.com/rust-lang/rust/issues/23338)
- let e = e.r();
+ elem.r().map(|e| {
let value = e.value();
(**value).to_owned()
})