diff options
author | David Zbarsky <dzbarsky@gmail.com> | 2015-11-02 21:54:44 -0800 |
---|---|---|
committer | David Zbarsky <dzbarsky@gmail.com> | 2015-11-06 00:22:31 -0800 |
commit | dfc90db1d73db82c1b90aac6ea8df4dc5fe9e434 (patch) | |
tree | a7ca362ca2b1e219248c7796d73ccf2409366b01 /components/script/dom | |
parent | 9fea6d2e46dd917f16a5f1ec0f6484e8164c7a3a (diff) | |
download | servo-dfc90db1d73db82c1b90aac6ea8df4dc5fe9e434.tar.gz servo-dfc90db1d73db82c1b90aac6ea8df4dc5fe9e434.zip |
Cleanup some unneeded let bindings
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/keyboardevent.rs | 22 | ||||
-rw-r--r-- | components/script/dom/node.rs | 4 | ||||
-rw-r--r-- | components/script/dom/window.rs | 4 |
3 files changed, 11 insertions, 19 deletions
diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index c7f91cccee8..e5804dcd6cb 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -85,19 +85,15 @@ impl KeyboardEvent { let ev = KeyboardEvent::new_uninitialized(window); ev.InitKeyboardEvent(type_, canBubble, cancelable, view, key_string, location, DOMString::new(), repeat, DOMString::new()); - // FIXME(https://github.com/rust-lang/rust/issues/23338) - { - let ev = ev.r(); - ev.key.set(key); - *ev.code.borrow_mut() = code; - ev.ctrl.set(ctrlKey); - ev.alt.set(altKey); - ev.shift.set(shiftKey); - ev.meta.set(metaKey); - ev.char_code.set(char_code); - ev.key_code.set(key_code); - ev.is_composing.set(isComposing); - } + ev.key.set(key); + *ev.code.borrow_mut() = code; + ev.ctrl.set(ctrlKey); + ev.alt.set(altKey); + ev.shift.set(shiftKey); + ev.meta.set(metaKey); + ev.char_code.set(char_code); + ev.key_code.set(key_code); + ev.is_composing.set(isComposing); ev } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index d65ce8bcba5..bd3e51a7e4d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2150,9 +2150,7 @@ impl NodeMethods for Node { let element = node.downcast::<Element>().unwrap(); let other_element = other.downcast::<Element>().unwrap(); assert!(element.attrs().len() == other_element.attrs().len()); - // FIXME(https://github.com/rust-lang/rust/issues/23338) - let attrs = element.attrs(); - attrs.iter().all(|attr| { + element.attrs().iter().all(|attr| { other_element.attrs().iter().any(|other_attr| { (*attr.namespace() == *other_attr.namespace()) && (attr.local_name() == other_attr.local_name()) && diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 9682b89cba6..93b8741f243 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1182,9 +1182,7 @@ impl Window { browsing_context.frame_element().map(|frame_element| { let window = window_from_node(frame_element); - // FIXME(https://github.com/rust-lang/rust/issues/23338) - let r = window.r(); - let context = r.browsing_context(); + let context = window.browsing_context(); Root::from_ref(context.unwrap().active_window()) }) } |