6 files changed, 24 insertions, 20 deletions
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index f176f3b60d0..a2809defdd6 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -110,8 +110,13 @@ use canvas_traits::canvas::{CanvasId, CanvasMsg};
 use canvas_traits::webgl::WebGLThreads;
 use compositing_traits::{CompositorMsg, CompositorProxy, SendableFrameTree};
 use constellation_traits::{
-    AnimationTickType, CompositorHitTestResult, EmbedderToConstellationMessage, LogEntry,
-    PaintMetricEvent, ScrollState, TraversalDirection, WindowSizeType,
+    AnimationTickType, AuxiliaryWebViewCreationRequest, AuxiliaryWebViewCreationResponse,
+    BroadcastMsg, DocumentState, EmbedderToConstellationMessage, IFrameLoadInfo,
+    IFrameLoadInfoWithData, IFrameSandboxState, IFrameSizeMsg, Job, LoadData, LoadOrigin, LogEntry,
+    MessagePortMsg, NavigationHistoryBehavior, PaintMetricEvent, PortMessageTask, SWManagerMsg,
+    SWManagerSenders, ScriptToConstellationChan, ScriptToConstellationMessage, ScrollState,
+    ServiceWorkerManagerFactory, ServiceWorkerMsg, StructuredSerializedData, TraversalDirection,
+    WindowSizeType,
 };
 use crossbeam_channel::{Receiver, Select, Sender, unbounded};
 use devtools_traits::{
@@ -121,9 +126,10 @@ use devtools_traits::{
 use embedder_traits::resources::{self, Resource};
 use embedder_traits::user_content_manager::UserContentManager;
 use embedder_traits::{
-    Cursor, EmbedderMsg, EmbedderProxy, ImeEvent, InputEvent, MediaSessionActionType,
-    MediaSessionEvent, MediaSessionPlaybackState, MouseButton, MouseButtonAction, MouseButtonEvent,
-    Theme, ViewportDetails, WebDriverCommandMsg, WebDriverLoadStatus,
+    AnimationState, CompositorHitTestResult, Cursor, EmbedderMsg, EmbedderProxy, ImeEvent,
+    InputEvent, MediaSessionActionType, MediaSessionEvent, MediaSessionPlaybackState, MouseButton,
+    MouseButtonAction, MouseButtonEvent, Theme, ViewportDetails, WebDriverCommandMsg,
+    WebDriverLoadStatus,
 };
 use euclid::Size2D;
 use euclid::default::Size2D as UntypedSize2D;
@@ -142,13 +148,8 @@ use net_traits::{self, IpcSend, ReferrerPolicy, ResourceThreads};
 use profile_traits::{mem, time};
 use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
 use script_traits::{
-    AnimationState, AuxiliaryWebViewCreationRequest, AuxiliaryWebViewCreationResponse,
-    BroadcastMsg, ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, DocumentState,
-    IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, IFrameSizeMsg, Job, LoadData,
-    LoadOrigin, MessagePortMsg, NavigationHistoryBehavior, PortMessageTask,
-    ProgressiveWebMetricType, SWManagerMsg, SWManagerSenders, ScriptThreadMessage,
-    ScriptToConstellationChan, ScriptToConstellationMessage, ServiceWorkerManagerFactory,
-    ServiceWorkerMsg, StructuredSerializedData, UpdatePipelineIdReason,
+    ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, ProgressiveWebMetricType,
+    ScriptThreadMessage, UpdatePipelineIdReason,
 };
 use serde::{Deserialize, Serialize};
 use servo_config::{opts, pref};
diff --git a/components/constellation/logging.rs b/components/constellation/logging.rs
index 264287524d3..97ff0202bd8 100644
--- a/components/constellation/logging.rs
+++ b/components/constellation/logging.rs
@@ -12,11 +12,13 @@ use std::thread;
 
 use backtrace::Backtrace;
 use base::id::WebViewId;
-use constellation_traits::{EmbedderToConstellationMessage, LogEntry};
+use constellation_traits::{
+    EmbedderToConstellationMessage, LogEntry, ScriptToConstellationChan,
+    ScriptToConstellationMessage,
+};
 use crossbeam_channel::Sender;
 use log::{Level, LevelFilter, Log, Metadata, Record};
 use parking_lot::ReentrantMutex;
-use script_traits::{ScriptToConstellationChan, ScriptToConstellationMessage};
 
 /// A logger directed at the constellation from content processes
 /// #[derive(Clone)]
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
index fc988f6e408..8095cd6f0ae 100644
--- a/components/constellation/pipeline.rs
+++ b/components/constellation/pipeline.rs
@@ -19,10 +19,11 @@ use base::id::{
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
 use compositing_traits::{CompositionPipeline, CompositorMsg, CompositorProxy};
+use constellation_traits::{LoadData, SWManagerMsg, ScriptToConstellationChan};
 use crossbeam_channel::{Sender, unbounded};
 use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
-use embedder_traits::ViewportDetails;
 use embedder_traits::user_content_manager::UserContentManager;
+use embedder_traits::{AnimationState, ViewportDetails};
 use fonts::{SystemFontServiceProxy, SystemFontServiceProxySender};
 use ipc_channel::Error;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
@@ -37,8 +38,8 @@ use profile_traits::mem::{ProfilerMsg, Reporter};
 use profile_traits::{mem as profile_mem, time};
 use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
 use script_traits::{
-    AnimationState, DiscardBrowsingContext, DocumentActivity, InitialScriptState, LoadData,
-    NewLayoutInfo, SWManagerMsg, ScriptThreadMessage, ScriptToConstellationChan,
+    DiscardBrowsingContext, DocumentActivity, InitialScriptState, NewLayoutInfo,
+    ScriptThreadMessage,
 };
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
diff --git a/components/constellation/serviceworker.rs b/components/constellation/serviceworker.rs
index 51384752d66..e566b8b01a0 100644
--- a/components/constellation/serviceworker.rs
+++ b/components/constellation/serviceworker.rs
@@ -2,9 +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 constellation_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
 use ipc_channel::Error;
 use ipc_channel::ipc::IpcSender;
-use script_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
 use servo_config::prefs;
diff --git a/components/constellation/session_history.rs b/components/constellation/session_history.rs
index 1da2ea4db65..4d7c9979497 100644
--- a/components/constellation/session_history.rs
+++ b/components/constellation/session_history.rs
@@ -6,9 +6,9 @@ use std::cmp::PartialEq;
 use std::fmt;
 
 use base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
+use constellation_traits::LoadData;
 use embedder_traits::ViewportDetails;
 use log::debug;
-use script_traits::LoadData;
 use servo_url::ServoUrl;
 
 use crate::browsingcontext::NewBrowsingContextInfo;
diff --git a/components/constellation/tracing.rs b/components/constellation/tracing.rs
index 7e38027afcb..a939bbafc48 100644
--- a/components/constellation/tracing.rs
+++ b/components/constellation/tracing.rs
@@ -113,7 +113,7 @@ mod from_script {
         };
     }
 
-    impl LogTarget for script_traits::ScriptToConstellationMessage {
+    impl LogTarget for constellation_traits::ScriptToConstellationMessage {
         fn log_target(&self) -> &'static str {
             match self {
                 Self::CompleteMessagePortTransfer(..) => target!("CompleteMessagePortTransfer"),