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

auto merge of #640 : recrack/servo/fixme_each_mut, r=jdm

Browse source
This commit is contained in:
bors-servo 2013-07-30 06:27:20 -07:00
commit ad8fa8b3d7
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/element.rs
View file

@ -14,7 +14,6 @@ use layout_interface::{ContentBoxesResponse};
use std::cell::Cell; use std::cell::Cell;
use std::comm::ChanOne; use std::comm::ChanOne;
use std::comm; use std::comm;
use std::uint;
use std::str::eq_slice; use std::str::eq_slice;
use extra::net::url::Url; use extra::net::url::Url;
use geom::size::Size2D; use geom::size::Size2D;
@ -136,9 +135,9 @@ impl<'self> Element {
pub fn get_attr(&'self self, name: &str) -> Option<&'self str> { pub fn get_attr(&'self self, name: &str) -> Option<&'self str> {
// FIXME: Need an each() that links lifetimes in Rust. // FIXME: Need an each() that links lifetimes in Rust.
for uint::range(0, self.attrs.len()) |i| { for self.attrs.iter().advance |attr| {
if eq_slice(self.attrs[i].name, name) { if eq_slice(attr.name, name) {
let val: &str = self.attrs[i].value; let val: &str = attr.value;
return Some(val); return Some(val);
} }
} }
@ -148,12 +147,11 @@ impl<'self> Element {
pub fn set_attr(&mut self, name: &DOMString, value: &DOMString) { pub fn set_attr(&mut self, name: &DOMString, value: &DOMString) {
let name = name.to_str(); let name = name.to_str();
let value = value.to_str(); let value = value.to_str();
// FIXME: We need a better each_mut in Rust; this is ugly.
let value_cell = Cell::new(value); let value_cell = Cell::new(value);
let mut found = false; let mut found = false;
for uint::range(0, self.attrs.len()) |i| { for self.attrs.mut_iter().advance |attr| {
if eq_slice(self.attrs[i].name, name) { if eq_slice(attr.name, name) {
self.attrs[i].value = value_cell.take().clone(); attr.value = value_cell.take().clone();
found = true; found = true;
break; break;
} }