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

* strict imports formatting

* Reformat all imports

components/constellation/browsingcontext.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::pipeline::Pipeline;
+use std::collections::{HashMap, HashSet};
+
 use euclid::Size2D;
 use log::warn;
 use msg::constellation_msg::{
     BrowsingContextGroupId, BrowsingContextId, PipelineId, TopLevelBrowsingContextId,
 };
-use std::collections::{HashMap, HashSet};
 use style_traits::CSSPixel;
 
+use crate::pipeline::Pipeline;
+
 /// Because a browsing context is only constructed once the document that's
 /// going to be in it becomes active (i.e. not when a pipeline is spawned), some
 /// values needed in browsing context are not easily available at the point of

components/constellation/constellation.rs

@@ -89,18 +89,15 @@
 //!
 //! See https://github.com/servo/servo/issues/14704
 
-use crate::browsingcontext::NewBrowsingContextInfo;
-use crate::browsingcontext::{
-    AllBrowsingContextsIterator, BrowsingContext, FullyActiveBrowsingContextsIterator,
-};
-use crate::event_loop::EventLoop;
-use crate::network_listener::NetworkListener;
-use crate::pipeline::{InitialPipelineState, Pipeline};
-use crate::serviceworker::ServiceWorkerUnprivilegedContent;
-use crate::session_history::{
-    JointSessionHistory, NeedsToReload, SessionHistoryChange, SessionHistoryDiff,
-};
-use crate::timer_scheduler::TimerScheduler;
+use std::borrow::{Cow, ToOwned};
+use std::collections::hash_map::Entry;
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::marker::PhantomData;
+use std::mem::replace;
+use std::rc::{Rc, Weak};
+use std::sync::{Arc, Mutex};
+use std::{process, thread};
+
 use background_hang_monitor::HangMonitorRegister;
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::canvas::{CanvasId, CanvasMsg};
@@ -115,9 +112,11 @@ use devtools_traits::{
     ChromeToDevtoolsControlMsg, DevtoolsControlMsg, DevtoolsPageInfo, NavigationState,
     ScriptToDevtoolsControlMsg,
 };
-use embedder_traits::{Cursor, EmbedderMsg, EmbedderProxy};
-use embedder_traits::{MediaSessionEvent, MediaSessionPlaybackState};
-use euclid::{default::Size2D as UntypedSize2D, Size2D};
+use embedder_traits::{
+    Cursor, EmbedderMsg, EmbedderProxy, MediaSessionEvent, MediaSessionPlaybackState,
+};
+use euclid::default::Size2D as UntypedSize2D;
+use euclid::Size2D;
 use gfx::font_cache_thread::FontCacheThread;
 use gfx_traits::Epoch;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
@@ -129,60 +128,51 @@ use layout_traits::LayoutThreadFactory;
 use log::{debug, error, info, warn};
 use media::{GLPlayerThreads, WindowGLContext};
 use msg::constellation_msg::{
-    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, HangMonitorAlert,
-};
-use msg::constellation_msg::{
-    BroadcastChannelRouterId, MessagePortId, MessagePortRouterId, PipelineNamespace,
-    PipelineNamespaceId, PipelineNamespaceRequest, TraversalDirection,
-};
-use msg::constellation_msg::{
-    BrowsingContextGroupId, BrowsingContextId, HistoryStateId, PipelineId,
-    TopLevelBrowsingContextId,
+    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, BroadcastChannelRouterId,
+    BrowsingContextGroupId, BrowsingContextId, HangMonitorAlert, HistoryStateId, MessagePortId,
+    MessagePortRouterId, PipelineId, PipelineNamespace, PipelineNamespaceId,
+    PipelineNamespaceRequest, TopLevelBrowsingContextId, TraversalDirection,
 };
 use net_traits::pub_domains::reg_host;
 use net_traits::request::{Referrer, RequestBuilder};
 use net_traits::storage_thread::{StorageThreadMsg, StorageType};
 use net_traits::{self, FetchResponseMsg, IpcSend, ResourceThreads};
-use profile_traits::mem;
-use profile_traits::time;
+use profile_traits::{mem, time};
 use script_traits::CompositorEvent::{MouseButtonEvent, MouseMoveEvent};
-use script_traits::{webdriver_msg, LogEntry, ScriptToConstellationChan, ServiceWorkerMsg};
 use script_traits::{
-    AnimationState, AnimationTickType, AuxiliaryBrowsingContextLoadInfo, BroadcastMsg,
-    CompositorEvent,
+    webdriver_msg, AnimationState, AnimationTickType, AuxiliaryBrowsingContextLoadInfo,
+    BroadcastMsg, CompositorEvent, ConstellationControlMsg, DiscardBrowsingContext,
+    DocumentActivity, DocumentState, HistoryEntryReplacement, IFrameLoadInfo,
+    IFrameLoadInfoWithData, IFrameSandboxState, IFrameSizeMsg, Job, LayoutControlMsg,
+    LayoutMsg as FromLayoutMsg, LoadData, LoadOrigin, LogEntry, MediaSessionActionType,
+    MessagePortMsg, MouseEventType, PortMessageTask, SWManagerMsg, SWManagerSenders,
+    ScriptMsg as FromScriptMsg, ScriptThreadFactory, ScriptToConstellationChan,
+    ServiceWorkerManagerFactory, ServiceWorkerMsg, StructuredSerializedData, TimerSchedulerMsg,
+    UpdatePipelineIdReason, WebDriverCommandMsg, WindowSizeData, WindowSizeType,
 };
-use script_traits::{ConstellationControlMsg, DiscardBrowsingContext};
-use script_traits::{DocumentActivity, DocumentState, LayoutControlMsg, LoadData, LoadOrigin};
-use script_traits::{HistoryEntryReplacement, IFrameSizeMsg, WindowSizeData, WindowSizeType};
-use script_traits::{
-    IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, TimerSchedulerMsg,
-};
-use script_traits::{
-    Job, LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, ScriptThreadFactory,
-    ServiceWorkerManagerFactory,
-};
-use script_traits::{MediaSessionActionType, MouseEventType};
-use script_traits::{MessagePortMsg, PortMessageTask, StructuredSerializedData};
-use script_traits::{SWManagerMsg, SWManagerSenders, UpdatePipelineIdReason, WebDriverCommandMsg};
 use serde::{Deserialize, Serialize};
 use servo_config::{opts, pref};
 use servo_rand::{random, Rng, ServoRng, SliceRandom};
 use servo_url::{Host, ImmutableOrigin, ServoUrl};
-use std::borrow::{Cow, ToOwned};
-use std::collections::hash_map::Entry;
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::marker::PhantomData;
-use std::mem::replace;
-use std::process;
-use std::rc::{Rc, Weak};
-use std::sync::{Arc, Mutex};
-use std::thread;
 use style_traits::CSSPixel;
 use webgpu::{self, WebGPU, WebGPURequest};
 use webrender::{RenderApi, RenderApiSender};
 use webrender_api::DocumentId;
 use webrender_traits::WebrenderExternalImageRegistry;
 
+use crate::browsingcontext::{
+    AllBrowsingContextsIterator, BrowsingContext, FullyActiveBrowsingContextsIterator,
+    NewBrowsingContextInfo,
+};
+use crate::event_loop::EventLoop;
+use crate::network_listener::NetworkListener;
+use crate::pipeline::{InitialPipelineState, Pipeline};
+use crate::serviceworker::ServiceWorkerUnprivilegedContent;
+use crate::session_history::{
+    JointSessionHistory, NeedsToReload, SessionHistoryChange, SessionHistoryDiff,
+};
+use crate::timer_scheduler::TimerScheduler;
+
 type PendingApprovalNavigations = HashMap<PipelineId, (LoadData, HistoryEntryReplacement)>;
 
 #[derive(Debug)]

components/constellation/event_loop.rs

@@ -6,11 +6,12 @@
 //! view of a script thread. When an `EventLoop` is dropped, an `ExitScriptThread`
 //! message is sent to the script thread, asking it to shut down.
 
+use std::marker::PhantomData;
+use std::rc::Rc;
+
 use ipc_channel::ipc::IpcSender;
 use ipc_channel::Error;
 use script_traits::ConstellationControlMsg;
-use std::marker::PhantomData;
-use std::rc::Rc;
 
 /// <https://html.spec.whatwg.org/multipage/#event-loop>
 pub struct EventLoop {

components/constellation/logging.rs

@@ -2,6 +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 std::borrow::ToOwned;
+use std::sync::Arc;
+use std::thread;
+
 use backtrace::Backtrace;
 use compositing_traits::ConstellationMsg as FromCompositorMsg;
 use crossbeam_channel::Sender;
@@ -9,9 +13,6 @@ use log::{debug, Level, LevelFilter, Log, Metadata, Record};
 use msg::constellation_msg::TopLevelBrowsingContextId;
 use script_traits::{LogEntry, ScriptMsg as FromScriptMsg, ScriptToConstellationChan};
 use servo_remutex::ReentrantMutex;
-use std::borrow::ToOwned;
-use std::sync::Arc;
-use std::thread;
 
 /// The constellation uses logging to perform crash reporting.
 /// The constellation receives all `warn!`, `error!` and `panic!` messages,

components/constellation/network_listener.rs

@@ -15,8 +15,10 @@ use msg::constellation_msg::PipelineId;
 use net::http_loader::{set_default_accept, set_default_accept_language};
 use net_traits::request::{Destination, Referrer, RequestBuilder};
 use net_traits::response::ResponseInit;
-use net_traits::{CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseMsg};
-use net_traits::{IpcSend, NetworkError, ResourceThreads};
+use net_traits::{
+    CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseMsg, IpcSend, NetworkError,
+    ResourceThreads,
+};
 
 pub struct NetworkListener {
     res_init: Option<ResponseInit>,

components/constellation/pipeline.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::event_loop::EventLoop;
-use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
+use std::borrow::Cow;
+use std::collections::{HashMap, HashSet};
+use std::rc::Rc;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+
 use background_hang_monitor::HangMonitorRegister;
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
-use compositing_traits::CompositionPipeline;
-use compositing_traits::CompositorMsg;
-use compositing_traits::CompositorProxy;
+use compositing_traits::{CompositionPipeline, CompositorMsg, CompositorProxy};
 use crossbeam_channel::{unbounded, Sender};
 use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
 use embedder_traits::EventLoopWaker;
@@ -21,37 +23,30 @@ use layout_traits::LayoutThreadFactory;
 use log::{debug, error, warn};
 use media::WindowGLContext;
 use metrics::PaintTimeMetrics;
-use msg::constellation_msg::TopLevelBrowsingContextId;
 use msg::constellation_msg::{
-    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, HangMonitorAlert,
-};
-use msg::constellation_msg::{BrowsingContextId, HistoryStateId};
-use msg::constellation_msg::{
-    PipelineId, PipelineNamespace, PipelineNamespaceId, PipelineNamespaceRequest,
+    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, BrowsingContextId,
+    HangMonitorAlert, HistoryStateId, PipelineId, PipelineNamespace, PipelineNamespaceId,
+    PipelineNamespaceRequest, TopLevelBrowsingContextId,
 };
 use net::image_cache::ImageCacheImpl;
 use net_traits::image_cache::ImageCache;
 use net_traits::ResourceThreads;
-use profile_traits::mem as profile_mem;
-use profile_traits::time;
+use profile_traits::{mem as profile_mem, time};
 use script_traits::{
-    AnimationState, ConstellationControlMsg, DiscardBrowsingContext, ScriptToConstellationChan,
+    AnimationState, ConstellationControlMsg, DiscardBrowsingContext, DocumentActivity,
+    InitialScriptState, LayoutControlMsg, LayoutMsg, LoadData, NewLayoutInfo, SWManagerMsg,
+    ScriptThreadFactory, ScriptToConstellationChan, TimerSchedulerMsg, WindowSizeData,
 };
-use script_traits::{DocumentActivity, InitialScriptState};
-use script_traits::{LayoutControlMsg, LayoutMsg, LoadData};
-use script_traits::{NewLayoutInfo, SWManagerMsg};
-use script_traits::{ScriptThreadFactory, TimerSchedulerMsg, WindowSizeData};
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
-use servo_config::{prefs, prefs::PrefValue};
+use servo_config::prefs;
+use servo_config::prefs::PrefValue;
 use servo_url::ServoUrl;
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
-use std::rc::Rc;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
 use webrender_api::DocumentId;
 
+use crate::event_loop::EventLoop;
+use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
+
 /// A `Pipeline` is the constellation's view of a `Document`. Each pipeline has an
 /// event loop (executed by a script thread) and a layout thread. A script thread
 /// may be responsible for many pipelines, but a layout thread is only responsible

components/constellation/sandboxing.rs

@@ -2,8 +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 crate::pipeline::UnprivilegedPipelineContent;
-use crate::serviceworker::ServiceWorkerUnprivilegedContent;
+use std::collections::HashMap;
+#[cfg(not(windows))]
+use std::env;
+use std::ffi::OsStr;
+use std::process;
+
 #[cfg(any(
     target_os = "macos",
     all(
@@ -19,11 +23,9 @@ use ipc_channel::Error;
 use serde::{Deserialize, Serialize};
 use servo_config::opts::Opts;
 use servo_config::prefs::PrefValue;
-use std::collections::HashMap;
-#[cfg(not(windows))]
-use std::env;
-use std::ffi::OsStr;
-use std::process;
+
+use crate::pipeline::UnprivilegedPipelineContent;
+use crate::serviceworker::ServiceWorkerUnprivilegedContent;
 
 #[derive(Deserialize, Serialize)]
 pub enum UnprivilegedContent {
@@ -50,9 +52,10 @@ impl UnprivilegedContent {
 /// Our content process sandbox profile on Mac. As restrictive as possible.
 #[cfg(target_os = "macos")]
 pub fn content_process_sandbox_profile() -> Profile {
+    use std::path::PathBuf;
+
     use embedder_traits::resources;
     use gaol::platform;
-    use std::path::PathBuf;
 
     let mut operations = vec![
         Operation::FileReadAll(PathPattern::Literal(PathBuf::from("/dev/urandom"))),
@@ -98,9 +101,10 @@ pub fn content_process_sandbox_profile() -> Profile {
     not(target_arch = "aarch64")
 ))]
 pub fn content_process_sandbox_profile() -> Profile {
-    use embedder_traits::resources;
     use std::path::PathBuf;
 
+    use embedder_traits::resources;
+
     let mut operations = vec![Operation::FileReadAll(PathPattern::Literal(PathBuf::from(
         "/dev/urandom",
     )))];

components/constellation/serviceworker.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::sandboxing::{spawn_multiprocess, UnprivilegedContent};
+use std::collections::HashMap;
+
 use ipc_channel::Error;
 use script_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
 use servo_config::prefs::{self, PrefValue};
 use servo_url::ImmutableOrigin;
-use std::collections::HashMap;
+
+use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
 
 /// Conceptually, this is glue to start an agent-cluster for a service worker agent.
 /// <https://html.spec.whatwg.org/multipage/#obtain-a-service-worker-agent>

components/constellation/session_history.rs

@@ -2,7 +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::browsingcontext::NewBrowsingContextInfo;
+use std::cmp::PartialEq;
+use std::{fmt, mem};
+
 use euclid::Size2D;
 use log::debug;
 use msg::constellation_msg::{
@@ -10,10 +12,10 @@ use msg::constellation_msg::{
 };
 use script_traits::LoadData;
 use servo_url::ServoUrl;
-use std::cmp::PartialEq;
-use std::{fmt, mem};
 use style_traits::CSSPixel;
 
+use crate::browsingcontext::NewBrowsingContextInfo;
+
 /// Represents the joint session history
 /// https://html.spec.whatwg.org/multipage/#joint-session-history
 #[derive(Debug)]

components/constellation/timer_scheduler.rs

@@ -2,11 +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 script_traits::{TimerEvent, TimerEventRequest, TimerSchedulerMsg};
 use std::cmp::{self, Ord};
 use std::collections::BinaryHeap;
 use std::time::{Duration, Instant};
 
+use script_traits::{TimerEvent, TimerEventRequest, TimerSchedulerMsg};
+
 pub struct TimerScheduler(BinaryHeap<ScheduledEvent>);
 
 struct ScheduledEvent {