Skip to content
Permalink
Browse files

Cleanup some unneeded let bindings

  • Loading branch information
dzbarsky committed Nov 6, 2015
1 parent 9fea6d2 commit dfc90db1d73db82c1b90aac6ea8df4dc5fe9e434
Showing with 12 additions and 21 deletions.
  1. +9 −13 components/script/dom/keyboardevent.rs
  2. +1 −3 components/script/dom/node.rs
  3. +1 −3 components/script/dom/window.rs
  4. +1 −2 ports/cef/frame.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
}

@@ -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()) &&
@@ -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())
})
}
@@ -38,9 +38,8 @@ full_cef_class_impl! {
this.browser.borrow_mut().as_mut().unwrap().send_window_event(event);
}}
fn get_url(&this,) -> cef_string_userfree_t {{
let this = this.downcast();
// FIXME(https://github.com/rust-lang/rust/issues/23338)
let url = this.url.borrow();
let url = this.downcast().url.borrow();
(*url).clone()
}}
fn get_text(&this, visitor: *mut cef_string_visitor_t [CefStringVisitor],) -> () {{

0 comments on commit dfc90db

Please sign in to comment.
You can’t perform that action at this time.