Strict import formatting (grouping and granularity) (#30325)

* strict imports formatting

* Reformat all imports

components/devtools/actor.rs

@@ -2,11 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-/// General actor system infrastructure.
-use crate::StreamId;
-use devtools_traits::PreciseTime;
-use log::{debug, warn};
-use serde_json::{Map, Value};
 use std::any::Any;
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
@@ -14,6 +9,13 @@ use std::mem::replace;
 use std::net::TcpStream;
 use std::sync::{Arc, Mutex};
 
+use devtools_traits::PreciseTime;
+use log::{debug, warn};
+use serde_json::{Map, Value};
+
+/// General actor system infrastructure.
+use crate::StreamId;
+
 #[derive(PartialEq)]
 pub enum ActorMessageStatus {
     Processed,

components/devtools/actors/browsing_context.rs

@@ -7,6 +7,17 @@
 //! Connection point for remote devtools that wish to investigate a particular Browsing Context's contents.
 //! Supports dynamic attaching and detaching which control notifications of navigation, etc.
 
+use std::cell::{Cell, RefCell};
+use std::collections::HashMap;
+use std::net::TcpStream;
+
+use devtools_traits::DevtoolScriptControlMsg::{self, WantsLiveNotifications};
+use devtools_traits::{DevtoolsPageInfo, NavigationState};
+use ipc_channel::ipc::IpcSender;
+use msg::constellation_msg::{BrowsingContextId, PipelineId};
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::emulation::EmulationActor;
 use crate::actors::inspector::InspectorActor;
@@ -18,16 +29,6 @@ use crate::actors::thread::ThreadActor;
 use crate::actors::timeline::TimelineActor;
 use crate::protocol::JsonPacketStream;
 use crate::StreamId;
-use devtools_traits::DevtoolScriptControlMsg::{self, WantsLiveNotifications};
-use devtools_traits::DevtoolsPageInfo;
-use devtools_traits::NavigationState;
-use ipc_channel::ipc::IpcSender;
-use msg::constellation_msg::{BrowsingContextId, PipelineId};
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::cell::{Cell, RefCell};
-use std::collections::HashMap;
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 struct BrowsingContextTraits {

components/devtools/actors/console.rs

@@ -7,30 +7,32 @@
 //! Mediates interaction between the remote web console and equivalent functionality (object
 //! inspection, JS evaluation, autocompletion) in Servo.
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::actors::browsing_context::BrowsingContextActor;
-use crate::actors::object::ObjectActor;
-use crate::actors::worker::WorkerActor;
-use crate::protocol::JsonPacketStream;
-use crate::{StreamId, UniqueId};
-use devtools_traits::CachedConsoleMessage;
-use devtools_traits::ConsoleMessage;
-use devtools_traits::EvaluateJSReply::{ActorValue, BooleanValue, StringValue};
-use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue};
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::net::TcpStream;
+
+use devtools_traits::EvaluateJSReply::{
+    ActorValue, BooleanValue, NullValue, NumberValue, StringValue, VoidValue,
+};
 use devtools_traits::{
-    CachedConsoleMessageTypes, ConsoleAPI, DevtoolScriptControlMsg, LogLevel, PageError,
+    CachedConsoleMessage, CachedConsoleMessageTypes, ConsoleAPI, ConsoleMessage,
+    DevtoolScriptControlMsg, LogLevel, PageError,
 };
 use ipc_channel::ipc::{self, IpcSender};
 use log::debug;
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use serde::Serialize;
 use serde_json::{self, Map, Number, Value};
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::net::TcpStream;
 use time::precise_time_ns;
 use uuid::Uuid;
 
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::browsing_context::BrowsingContextActor;
+use crate::actors::object::ObjectActor;
+use crate::actors::worker::WorkerActor;
+use crate::protocol::JsonPacketStream;
+use crate::{StreamId, UniqueId};
+
 trait EncodableConsoleMessage {
     fn encode(&self) -> serde_json::Result<String>;
 }

components/devtools/actors/device.rs

@@ -2,13 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::protocol::JsonPacketStream;
-use crate::protocol::{ActorDescription, Method};
-use crate::StreamId;
+use std::net::TcpStream;
+
 use serde::Serialize;
 use serde_json::{Map, Value};
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::{ActorDescription, JsonPacketStream, Method};
+use crate::StreamId;
 
 #[derive(Serialize)]
 struct GetDescriptionReply {

components/devtools/actors/emulation.rs

@@ -2,10 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 pub struct EmulationActor {
     pub name: String,

components/devtools/actors/framerate.rs

@@ -2,15 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::actors::timeline::HighResolutionStamp;
-use crate::StreamId;
+use std::mem;
+use std::net::TcpStream;
+
 use devtools_traits::DevtoolScriptControlMsg;
 use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::PipelineId;
 use serde_json::{Map, Value};
-use std::mem;
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::timeline::HighResolutionStamp;
+use crate::StreamId;
 
 pub struct FramerateActor {
     name: String,

components/devtools/actors/inspector.rs

@@ -5,19 +5,22 @@
 //! Liberally derived from the [Firefox JS implementation]
 //! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js).
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::actors::browsing_context::BrowsingContextActor;
-use crate::protocol::JsonPacketStream;
-use crate::StreamId;
-use devtools_traits::DevtoolScriptControlMsg::{GetChildren, GetDocumentElement, GetRootNode};
-use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
+use std::cell::RefCell;
+use std::net::TcpStream;
+
+use devtools_traits::DevtoolScriptControlMsg::{
+    GetChildren, GetDocumentElement, GetLayout, GetRootNode, ModifyAttribute,
+};
 use devtools_traits::{ComputedNodeLayout, DevtoolScriptControlMsg, NodeInfo};
 use ipc_channel::ipc::{self, IpcSender};
 use msg::constellation_msg::PipelineId;
 use serde::Serialize;
 use serde_json::{self, Map, Value};
-use std::cell::RefCell;
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::browsing_context::BrowsingContextActor;
+use crate::protocol::JsonPacketStream;
+use crate::StreamId;
 
 pub struct InspectorActor {
     pub name: String,

components/devtools/actors/memory.rs

@@ -2,11 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::StreamId;
+use std::net::TcpStream;
+
 use serde::Serialize;
 use serde_json::{Map, Value};
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::StreamId;
 
 #[derive(Serialize)]
 pub struct TimelineMemoryReply {

components/devtools/actors/network_event.rs

@@ -6,18 +6,19 @@
 //! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/webconsole.js).
 //! Handles interaction with the remote web console on network events (HTTP requests, responses) in Servo.
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::protocol::JsonPacketStream;
-use crate::StreamId;
-use devtools_traits::HttpRequest as DevtoolsHttpRequest;
-use devtools_traits::HttpResponse as DevtoolsHttpResponse;
+use std::net::TcpStream;
+
+use devtools_traits::{HttpRequest as DevtoolsHttpRequest, HttpResponse as DevtoolsHttpResponse};
 use headers::{ContentType, Cookie, HeaderMapExt};
 use http::{header, HeaderMap, Method, StatusCode};
 use serde::Serialize;
 use serde_json::{Map, Value};
-use std::net::TcpStream;
 use time::Tm;
 
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::JsonPacketStream;
+use crate::StreamId;
+
 struct HttpRequest {
     url: String,
     method: Method,

components/devtools/actors/object.rs

@@ -2,10 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 pub struct ObjectActor {
     pub name: String,

components/devtools/actors/performance.rs

@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::{ActorDescription, JsonPacketStream, Method};
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 pub struct PerformanceActor {
     name: String,

components/devtools/actors/preference.rs

@@ -2,14 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::protocol::JsonPacketStream;
-use crate::StreamId;
+use std::net::TcpStream;
+
 use serde::Serialize;
 use serde_json::{Map, Value};
 use servo_config::pref_util::PrefValue;
 use servo_config::prefs::pref_map;
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::JsonPacketStream;
+use crate::StreamId;
 
 pub struct PreferenceActor {
     name: String,

components/devtools/actors/process.rs

@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 struct ListWorkersReply {

components/devtools/actors/profiler.rs

@@ -2,10 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::StreamId;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 pub struct ProfilerActor {
     name: String,

components/devtools/actors/root.rs

@@ -2,6 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 /// Liberally derived from the [Firefox JS implementation]
 /// (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/root.js).
 /// Connection point for all new remote devtools interactions, providing lists of know actors
@@ -13,9 +18,6 @@ use crate::actors::tab::{TabDescriptorActor, TabDescriptorActorMsg};
 use crate::actors::worker::{WorkerActor, WorkerMsg};
 use crate::protocol::{ActorDescription, JsonPacketStream};
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 struct ActorTraits {

components/devtools/actors/stylesheets.rs

@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 struct GetStyleSheetsReply {

components/devtools/actors/tab.rs

@@ -2,14 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::actors::browsing_context::{BrowsingContextActor, BrowsingContextActorMsg};
 use crate::actors::root::RootActor;
 use crate::protocol::JsonPacketStream;
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 pub struct TabDescriptorTraits {

components/devtools/actors/thread.rs

@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::net::TcpStream;
+
+use serde::Serialize;
+use serde_json::{Map, Value};
+
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
 use crate::StreamId;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use std::net::TcpStream;
 
 #[derive(Serialize)]
 struct ThreadAttached {

components/devtools/actors/timeline.rs

@@ -2,18 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::actors::framerate::FramerateActor;
-use crate::actors::memory::{MemoryActor, TimelineMemoryReply};
-use crate::protocol::JsonPacketStream;
-use crate::StreamId;
-use devtools_traits::DevtoolScriptControlMsg;
-use devtools_traits::DevtoolScriptControlMsg::{DropTimelineMarkers, SetTimelineMarkers};
-use devtools_traits::{PreciseTime, TimelineMarker, TimelineMarkerType};
-use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-use msg::constellation_msg::PipelineId;
-use serde::{Serialize, Serializer};
-use serde_json::{Map, Value};
 use std::cell::RefCell;
 use std::error::Error;
 use std::net::TcpStream;
@@ -21,6 +9,19 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;
 
+use devtools_traits::DevtoolScriptControlMsg::{DropTimelineMarkers, SetTimelineMarkers};
+use devtools_traits::{DevtoolScriptControlMsg, PreciseTime, TimelineMarker, TimelineMarkerType};
+use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
+use msg::constellation_msg::PipelineId;
+use serde::{Serialize, Serializer};
+use serde_json::{Map, Value};
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::framerate::FramerateActor;
+use crate::actors::memory::{MemoryActor, TimelineMemoryReply};
+use crate::protocol::JsonPacketStream;
+use crate::StreamId;
+
 pub struct TimelineActor {
     name: String,
     script_sender: IpcSender<DevtoolScriptControlMsg>,

components/devtools/actors/worker.rs

@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::protocol::JsonPacketStream;
-use crate::StreamId;
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::net::TcpStream;
+
 use devtools_traits::DevtoolScriptControlMsg::WantsLiveNotifications;
 use devtools_traits::{DevtoolScriptControlMsg, WorkerId};
 use ipc_channel::ipc::IpcSender;
@@ -12,9 +13,10 @@ use msg::constellation_msg::TEST_PIPELINE_ID;
 use serde::Serialize;
 use serde_json::{Map, Value};
 use servo_url::ServoUrl;
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::net::TcpStream;
+
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::JsonPacketStream;
+use crate::StreamId;
 
 #[derive(Clone, Copy)]
 #[allow(dead_code)]

components/devtools/lib.rs

@@ -12,6 +12,27 @@
 #![allow(non_snake_case)]
 #![deny(unsafe_code)]
 
+use std::borrow::ToOwned;
+use std::collections::hash_map::Entry::{Occupied, Vacant};
+use std::collections::HashMap;
+use std::io::Read;
+use std::net::{Shutdown, TcpListener, TcpStream};
+use std::sync::{Arc, Mutex};
+use std::thread;
+
+use crossbeam_channel::{unbounded, Receiver, Sender};
+use devtools_traits::{
+    ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolScriptControlMsg, DevtoolsControlMsg,
+    DevtoolsPageInfo, LogLevel, NavigationState, NetworkEvent, PageError,
+    ScriptToDevtoolsControlMsg, WorkerId,
+};
+use embedder_traits::{EmbedderMsg, EmbedderProxy, PromptDefinition, PromptOrigin, PromptResult};
+use ipc_channel::ipc::{self, IpcSender};
+use log::{debug, warn};
+use msg::constellation_msg::{BrowsingContextId, PipelineId};
+use serde::Serialize;
+use servo_rand::RngCore;
+
 use crate::actor::{Actor, ActorRegistry};
 use crate::actors::browsing_context::BrowsingContextActor;
 use crate::actors::console::{ConsoleActor, Root};
@@ -25,25 +46,6 @@ use crate::actors::root::RootActor;
 use crate::actors::thread::ThreadActor;
 use crate::actors::worker::{WorkerActor, WorkerType};
 use crate::protocol::JsonPacketStream;
-use crossbeam_channel::{unbounded, Receiver, Sender};
-use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg};
-use devtools_traits::{
-    DevtoolScriptControlMsg, DevtoolsPageInfo, LogLevel, NavigationState, NetworkEvent,
-};
-use devtools_traits::{PageError, ScriptToDevtoolsControlMsg, WorkerId};
-use embedder_traits::{EmbedderMsg, EmbedderProxy, PromptDefinition, PromptOrigin, PromptResult};
-use ipc_channel::ipc::{self, IpcSender};
-use log::{debug, warn};
-use msg::constellation_msg::{BrowsingContextId, PipelineId};
-use serde::Serialize;
-use servo_rand::RngCore;
-use std::borrow::ToOwned;
-use std::collections::hash_map::Entry::{Occupied, Vacant};
-use std::collections::HashMap;
-use std::io::Read;
-use std::net::{Shutdown, TcpListener, TcpStream};
-use std::sync::{Arc, Mutex};
-use std::thread;
 
 mod actor;
 /// Corresponds to http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/

components/devtools/protocol.rs

@@ -6,13 +6,14 @@
 //! [JSON packets]
 //! (https://wiki.mozilla.org/Remote_Debugging_Protocol_Stream_Transport#JSON_Packets).
 
-use log::debug;
-use serde::Serialize;
-use serde_json::{self, Value};
 use std::error::Error;
 use std::io::{Read, Write};
 use std::net::TcpStream;
 
+use log::debug;
+use serde::Serialize;
+use serde_json::{self, Value};
+
 #[derive(Serialize)]
 pub struct ActorDescription {
     pub category: &'static str,