Fix reported test-tidy errors for unmerged import blocks

This merges import blocks that were reported by tidy as unmerged.
This commit is contained in:
Brandon Fairchild 2015-09-17 17:55:01 -04:00
parent e924393be8
commit de3547e401
213 changed files with 598 additions and 934 deletions

View file

@ -8,17 +8,10 @@ use dom::bindings::codegen::Bindings::FunctionBinding::Function;
use dom::bindings::global::global_object_for_js_object;
use dom::bindings::utils::Reflectable;
use dom::window::ScriptHelpers;
use horribly_inefficient_timers;
use script_task::{ScriptChan, TimerSource, CommonScriptMsg};
use util::mem::HeapSizeOf;
use util::str::DOMString;
use util::task::spawn_named;
use js::jsapi::{RootedValue, HandleValue, Heap};
use js::jsval::{JSVal, UndefinedValue};
use script_task::{ScriptChan, TimerSource, CommonScriptMsg};
use std::borrow::ToOwned;
use std::cell::Cell;
use std::cmp;
@ -28,6 +21,10 @@ use std::hash::{Hash, Hasher};
use std::rc::Rc;
use std::sync::mpsc::Select;
use std::sync::mpsc::{channel, Sender};
use util::mem::HeapSizeOf;
use util::str::DOMString;
use util::task::spawn_named;
#[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf)]
pub struct TimerId(i32);