Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 18:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8295 - Ms2ger:cleanup, r=jdm

Browse source 
Various cleanup.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8295)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-03 16:28:14 +05:30
commit 1794e5875a
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/devtools.rs
View file

@ -155,12 +155,12 @@ pub fn handle_modify_attribute(page: &Rc<Page>,
let node = find_node_by_unique_id(&*page, pipeline, node_id); let node = find_node_by_unique_id(&*page, pipeline, node_id);
let elem = node.downcast::<Element>().expect("should be getting layout of element"); let elem = node.downcast::<Element>().expect("should be getting layout of element");
for modification in &modifications { for modification in modifications {
match modification.newValue { match modification.newValue {
Some(ref string) => { Some(string) => {
let _ = elem.SetAttribute(modification.attributeName.clone(), string.clone()); let _ = elem.SetAttribute(modification.attributeName, string);
}, },
None => elem.RemoveAttribute(modification.attributeName.clone()), None => elem.RemoveAttribute(modification.attributeName),
} }
} }
} }

5
components/script/dom/domtokenlist.rs
View file

@ -64,10 +64,7 @@ impl DOMTokenListMethods for DOMTokenList {
// https://dom.spec.whatwg.org/#dom-domtokenlist-item // https://dom.spec.whatwg.org/#dom-domtokenlist-item
fn Item(&self, index: u32) -> Option<DOMString> { fn Item(&self, index: u32) -> Option<DOMString> {
self.attribute().and_then(|attr| { self.attribute().and_then(|attr| {
let attr = attr.r(); attr.value().as_tokens().get(index as usize).map(|token| (**token).to_owned())
Some(attr.value().as_tokens()).and_then(|tokens| {
tokens.get(index as usize).map(|token| (**token).to_owned())
})
}) })
} }