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

* strict imports formatting

* Reformat all imports

components/script_traits/compositor.rs

@@ -6,8 +6,8 @@
 
 use embedder_traits::Cursor;
 use serde::{Deserialize, Serialize};
+use webrender_api::units::{LayoutSize, LayoutVector2D};
 use webrender_api::{
-    units::{LayoutSize, LayoutVector2D},
     Epoch, ExternalScrollId, PipelineId, ScrollLocation, ScrollSensitivity, SpatialId,
 };
 

components/script_traits/lib.rs

@@ -15,15 +15,12 @@ pub mod serializable;
 pub mod transferable;
 pub mod webdriver_msg;
 
-use crate::compositor::CompositorDisplayListInfo;
-pub use crate::script_msg::{
-    DOMMessage, EventResult, HistoryEntryReplacement, IFrameSizeMsg, Job, JobError, JobResult,
-    JobResultValue, JobType, LayoutMsg, LogEntry, SWManagerMsg, SWManagerSenders, ScopeThings,
-    ScriptMsg, ServiceWorkerMsg,
-};
-use crate::serializable::{BlobData, BlobImpl};
-use crate::transferable::MessagePortImpl;
-use crate::webdriver_msg::{LoadStatus, WebDriverScriptCommand};
+use std::borrow::Cow;
+use std::collections::{HashMap, VecDeque};
+use std::fmt;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+
 use bitflags::bitflags;
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
@@ -31,10 +28,10 @@ use compositor::ScrollTreeNodeId;
 use crossbeam_channel::{Receiver, RecvTimeoutError, Sender};
 use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId};
 use embedder_traits::Cursor;
-use euclid::{default::Point2D, Length, Rect, Scale, Size2D, UnknownUnit, Vector2D};
+use euclid::default::Point2D;
+use euclid::{Length, Rect, Scale, Size2D, UnknownUnit, Vector2D};
 use gfx_traits::Epoch;
-use http::HeaderMap;
-use http::Method;
+use http::{HeaderMap, Method};
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::Error as IpcError;
 use keyboard_types::webdriver::Event as WebDriverInputEvent;
@@ -44,30 +41,21 @@ use log::warn;
 use malloc_size_of::malloc_size_of_is_0;
 use malloc_size_of_derive::MallocSizeOf;
 use media::WindowGLContext;
-use msg::constellation_msg::BackgroundHangMonitorRegister;
 use msg::constellation_msg::{
-    BlobId, BrowsingContextId, HistoryStateId, MessagePortId, PipelineId,
+    BackgroundHangMonitorRegister, BlobId, BrowsingContextId, HistoryStateId, MessagePortId,
+    PipelineId, PipelineNamespaceId, TopLevelBrowsingContextId,
 };
-use msg::constellation_msg::{PipelineNamespaceId, TopLevelBrowsingContextId};
 use net_traits::image::base::Image;
 use net_traits::image_cache::ImageCache;
 use net_traits::request::{Referrer, RequestBody};
 use net_traits::storage_thread::StorageType;
 use net_traits::{FetchResponseMsg, ReferrerPolicy, ResourceThreads};
 use pixels::PixelFormat;
-use profile_traits::mem;
-use profile_traits::time as profile_time;
+use profile_traits::{mem, time as profile_time};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use servo_atoms::Atom;
-use servo_url::ImmutableOrigin;
-use servo_url::ServoUrl;
-use std::borrow::Cow;
-use std::collections::{HashMap, VecDeque};
-use std::fmt;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use style_traits::CSSPixel;
-use style_traits::SpeculativePainter;
+use servo_url::{ImmutableOrigin, ServoUrl};
+use style_traits::{CSSPixel, SpeculativePainter};
 use webgpu::identity::WebGPUMsg;
 use webrender_api::units::{DeviceIntSize, DevicePixel, LayoutPixel, LayoutPoint, WorldPoint};
 use webrender_api::{
@@ -75,6 +63,16 @@ use webrender_api::{
     HitTestFlags, ImageData, ImageDescriptor, ImageKey, PipelineId as WebRenderPipelineId,
 };
 
+use crate::compositor::CompositorDisplayListInfo;
+pub use crate::script_msg::{
+    DOMMessage, EventResult, HistoryEntryReplacement, IFrameSizeMsg, Job, JobError, JobResult,
+    JobResultValue, JobType, LayoutMsg, LogEntry, SWManagerMsg, SWManagerSenders, ScopeThings,
+    ScriptMsg, ServiceWorkerMsg,
+};
+use crate::serializable::{BlobData, BlobImpl};
+use crate::transferable::MessagePortImpl;
+use crate::webdriver_msg::{LoadStatus, WebDriverScriptCommand};
+
 /// The address of a node. Layout sends these back. They must be validated via
 /// `from_untrusted_node_address` before they can be used, because we do not trust layout.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]

components/script_traits/script_msg.rs

@@ -2,19 +2,9 @@
  * 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::AnimationState;
-use crate::AuxiliaryBrowsingContextLoadInfo;
-use crate::BroadcastMsg;
-use crate::DocumentState;
-use crate::IFrameLoadInfoWithData;
-use crate::LayoutControlMsg;
-use crate::LoadData;
-use crate::MessagePortMsg;
-use crate::PortMessageTask;
-use crate::StructuredSerializedData;
-use crate::WindowSizeType;
-use crate::WorkerGlobalScopeInit;
-use crate::WorkerScriptLoadOrigin;
+use std::collections::{HashMap, VecDeque};
+use std::fmt;
+
 use canvas_traits::canvas::{CanvasId, CanvasMsg};
 use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
 use embedder_traits::{EmbedderMsg, MediaSessionEvent};
@@ -23,25 +13,26 @@ use euclid::Size2D;
 use gfx_traits::Epoch;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use msg::constellation_msg::{
-    BroadcastChannelRouterId, BrowsingContextId, MessagePortId, MessagePortRouterId, PipelineId,
-    TopLevelBrowsingContextId,
+    BroadcastChannelRouterId, BrowsingContextId, HistoryStateId, MessagePortId,
+    MessagePortRouterId, PipelineId, ServiceWorkerId, ServiceWorkerRegistrationId,
+    TopLevelBrowsingContextId, TraversalDirection,
 };
-use msg::constellation_msg::{HistoryStateId, TraversalDirection};
-use msg::constellation_msg::{ServiceWorkerId, ServiceWorkerRegistrationId};
 use net_traits::request::RequestBuilder;
 use net_traits::storage_thread::StorageType;
 use net_traits::CoreResourceMsg;
-use serde::Deserialize;
-use serde::Serialize;
-use servo_url::ImmutableOrigin;
-use servo_url::ServoUrl;
+use serde::{Deserialize, Serialize};
+use servo_url::{ImmutableOrigin, ServoUrl};
 use smallvec::SmallVec;
-use std::collections::{HashMap, VecDeque};
-use std::fmt;
 use style_traits::CSSPixel;
 use webgpu::{wgpu, WebGPU, WebGPUResponseResult};
 use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
 
+use crate::{
+    AnimationState, AuxiliaryBrowsingContextLoadInfo, BroadcastMsg, DocumentState,
+    IFrameLoadInfoWithData, LayoutControlMsg, LoadData, MessagePortMsg, PortMessageTask,
+    StructuredSerializedData, WindowSizeType, WorkerGlobalScopeInit, WorkerScriptLoadOrigin,
+};
+
 /// An iframe sizing operation.
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub struct IFrameSizeMsg {

components/script_traits/serializable.rs

@@ -8,12 +8,13 @@
 //! so that the other modules involved in the serialization don't have
 //! to depend on script.
 
+use std::cell::RefCell;
+use std::path::PathBuf;
+
 use malloc_size_of_derive::MallocSizeOf;
 use msg::constellation_msg::BlobId;
 use net_traits::filemanager_thread::RelativePos;
 use serde::{Deserialize, Serialize};
-use std::cell::RefCell;
-use std::path::PathBuf;
 use uuid::Uuid;
 
 /// File-based blob

components/script_traits/tests/compositor.rs

@@ -4,10 +4,8 @@
 
 use euclid::Size2D;
 use script_traits::compositor::{ScrollTree, ScrollTreeNodeId, ScrollableNodeInfo};
-use webrender_api::{
-    units::LayoutVector2D, ExternalScrollId, PipelineId, ScrollLocation, ScrollSensitivity,
-    SpatialId,
-};
+use webrender_api::units::LayoutVector2D;
+use webrender_api::{ExternalScrollId, PipelineId, ScrollLocation, ScrollSensitivity, SpatialId};
 
 fn add_mock_scroll_node(tree: &mut ScrollTree) -> ScrollTreeNodeId {
     let pipeline_id = PipelineId(0, 0);

components/script_traits/transferable.rs

@@ -7,11 +7,13 @@
 //! so that the other modules involved in the transfer don't have
 //! to depend on script.
 
-use crate::PortMessageTask;
+use std::collections::VecDeque;
+
 use malloc_size_of_derive::MallocSizeOf;
 use msg::constellation_msg::MessagePortId;
 use serde::{Deserialize, Serialize};
-use std::collections::VecDeque;
+
+use crate::PortMessageTask;
 
 #[derive(Debug, Deserialize, MallocSizeOf, Serialize)]
 enum MessagePortState {

components/script_traits/webdriver_msg.rs

@@ -4,6 +4,8 @@
 
 #![allow(missing_docs)]
 
+use std::collections::HashMap;
+
 use cookie::Cookie;
 use euclid::default::Rect;
 use hyper_serde::Serde;
@@ -11,7 +13,6 @@ use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::BrowsingContextId;
 use serde::{Deserialize, Serialize};
 use servo_url::ServoUrl;
-use std::collections::HashMap;
 use webdriver::common::{WebElement, WebFrame, WebWindow};
 use webdriver::error::ErrorStatus;