mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
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:
parent
e924393be8
commit
de3547e401
213 changed files with 598 additions and 934 deletions
|
@ -9,15 +9,13 @@
|
|||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use actors::object::ObjectActor;
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use devtools_traits::CachedConsoleMessage;
|
||||
use devtools_traits::EvaluateJSReply::{NullValue, VoidValue, NumberValue};
|
||||
use devtools_traits::EvaluateJSReply::{StringValue, BooleanValue, ActorValue};
|
||||
use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR, CONSOLE_API};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use protocol::JsonPacketStream;
|
||||
use rustc_serialize::json::{self, Json, ToJson};
|
||||
use std::cell::RefCell;
|
||||
use std::collections::BTreeMap;
|
||||
|
|
|
@ -2,17 +2,16 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use actors::timeline::HighResolutionStamp;
|
||||
use devtools_traits::DevtoolScriptControlMsg;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use rustc_serialize::json;
|
||||
use std::mem;
|
||||
use std::net::TcpStream;
|
||||
use time::precise_time_ns;
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use actors::timeline::HighResolutionStamp;
|
||||
use devtools_traits::DevtoolScriptControlMsg;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
|
||||
pub struct FramerateActor {
|
||||
name: String,
|
||||
pipeline: PipelineId,
|
||||
|
|
|
@ -5,15 +5,13 @@
|
|||
//! Liberally derived from the [Firefox JS implementation]
|
||||
//! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js).
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
|
||||
use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren};
|
||||
use devtools_traits::{DevtoolScriptControlMsg, NodeInfo, ComputedNodeLayout};
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use protocol::JsonPacketStream;
|
||||
use rustc_serialize::json::{self, Json, ToJson};
|
||||
use std::cell::RefCell;
|
||||
use std::collections::BTreeMap;
|
||||
|
|
|
@ -2,11 +2,10 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use rustc_serialize::json;
|
||||
use std::net::TcpStream;
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
|
||||
#[derive(RustcEncodable)]
|
||||
pub struct TimelineMemoryReply {
|
||||
jsObjectSize: u64,
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use rustc_serialize::json;
|
||||
use std::net::TcpStream;
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
|
||||
use rustc_serialize::json;
|
||||
use std::net::TcpStream;
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use actors::tab::{TabActor, TabActorMsg};
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use rustc_serialize::json;
|
||||
use std::net::TcpStream;
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
|||
use actors::console::ConsoleActor;
|
||||
use devtools_traits::DevtoolScriptControlMsg::WantsLiveNotifications;
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use rustc_serialize::json;
|
||||
use std::net::TcpStream;
|
||||
|
||||
|
|
|
@ -2,22 +2,21 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use rustc_serialize::{json, Encoder, Encodable};
|
||||
use std::cell::RefCell;
|
||||
use std::net::TcpStream;
|
||||
use std::sync::mpsc::channel;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread::sleep_ms;
|
||||
|
||||
use actor::{Actor, ActorRegistry, ActorMessageStatus};
|
||||
use actors::framerate::FramerateActor;
|
||||
use actors::memory::{MemoryActor, TimelineMemoryReply};
|
||||
use devtools_traits::DevtoolScriptControlMsg;
|
||||
use devtools_traits::DevtoolScriptControlMsg::{SetTimelineMarkers, DropTimelineMarkers};
|
||||
use devtools_traits::{PreciseTime, TimelineMarker, TimelineMarkerType};
|
||||
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use protocol::JsonPacketStream;
|
||||
use rustc_serialize::{json, Encoder, Encodable};
|
||||
use std::cell::RefCell;
|
||||
use std::net::TcpStream;
|
||||
use std::sync::mpsc::channel;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread::sleep_ms;
|
||||
use util::task;
|
||||
|
||||
pub struct TimelineActor {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue