aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/element.rs
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2013-10-14 23:11:35 -0600
committerJack Moffitt <jack@metajack.im>2013-10-21 17:38:34 -0600
commit94202661c03500fffcc7ec3e566e2a2a168c7dfc (patch)
tree111764fc98e2cfe3995e2c9d20332c29b989f761 /src/components/script/dom/element.rs
parent8b47221ff8c77281eb55c5c671f23ae455cfe6bd (diff)
downloadservo-94202661c03500fffcc7ec3e566e2a2a168c7dfc.tar.gz
servo-94202661c03500fffcc7ec3e566e2a2a168c7dfc.zip
Update to latest Rust.
Diffstat (limited to 'src/components/script/dom/element.rs')
-rw-r--r--src/components/script/dom/element.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 2ee2e8ade5a..2babf101e6b 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -133,7 +133,7 @@ impl ElementLike for Element {
fn get_attr<'a>(&'a self, name: &str) -> Option<&'a str> {
// FIXME: only case-insensitive in the HTML namespace (as opposed to SVG, etc.)
let name = name.to_ascii_lower();
- let value: Option<&str> = self.attrs.find_equiv(&name).map(|&value| {
+ let value: Option<&str> = self.attrs.find_equiv(&name).map(|value| {
let value: &str = *value;
value
});
@@ -296,10 +296,10 @@ impl Element {
let scope = win.reflector().get_jsobject();
let rects = do rects.map |r| {
ClientRect::new(
- r.origin.y.to_f32(),
- (r.origin.y + r.size.height).to_f32(),
- r.origin.x.to_f32(),
- (r.origin.x + r.size.width).to_f32(),
+ r.origin.y.to_f32().unwrap(),
+ (r.origin.y + r.size.height).to_f32().unwrap(),
+ r.origin.x.to_f32().unwrap(),
+ (r.origin.x + r.size.width).to_f32().unwrap(),
cx,
scope)
};
@@ -320,10 +320,10 @@ impl Element {
let cx = win.get_cx();
let scope = win.reflector().get_jsobject();
ClientRect::new(
- rect.origin.y.to_f32(),
- (rect.origin.y + rect.size.height).to_f32(),
- rect.origin.x.to_f32(),
- (rect.origin.x + rect.size.width).to_f32(),
+ rect.origin.y.to_f32().unwrap(),
+ (rect.origin.y + rect.size.height).to_f32().unwrap(),
+ rect.origin.x.to_f32().unwrap(),
+ (rect.origin.x + rect.size.width).to_f32().unwrap(),
cx,
scope)
}