From b9bf9f873b22952a1f21d2d23c16cf833d020d37 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sun, 26 Apr 2020 17:49:06 -0400
Subject: [PATCH] Move some console-related message types into the console
 code.

---
 components/devtools/actors/console.rs | 28 ++++++++++++++++++++++++++-
 components/devtools/lib.rs            | 26 -------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs
index 6a6ef1243d4..505256d970c 100644
--- a/components/devtools/actors/console.rs
+++ b/components/devtools/actors/console.rs
@@ -13,8 +13,8 @@ use crate::actors::object::ObjectActor;
 use crate::actors::worker::WorkerActor;
 use crate::protocol::JsonPacketStream;
 use crate::UniqueId;
-use crate::{ConsoleAPICall, ConsoleMessage, ConsoleMsg, PageErrorMsg};
 use devtools_traits::CachedConsoleMessage;
+use devtools_traits::ConsoleMessage;
 use devtools_traits::EvaluateJSReply::{ActorValue, BooleanValue, StringValue};
 use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue};
 use devtools_traits::{
@@ -473,3 +473,29 @@ impl Actor for ConsoleActor {
         })
     }
 }
+
+#[derive(Serialize)]
+struct ConsoleAPICall {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    message: ConsoleMsg,
+}
+
+#[derive(Serialize)]
+struct ConsoleMsg {
+    level: String,
+    timeStamp: u64,
+    arguments: Vec<String>,
+    filename: String,
+    lineNumber: usize,
+    columnNumber: usize,
+}
+
+#[derive(Serialize)]
+struct PageErrorMsg {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    pageError: PageError,
+}
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 477e44494ee..a12205d4724 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -76,32 +76,6 @@ enum UniqueId {
     Worker(WorkerId),
 }
 
-#[derive(Serialize)]
-struct ConsoleAPICall {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-    message: ConsoleMsg,
-}
-
-#[derive(Serialize)]
-struct ConsoleMsg {
-    level: String,
-    timeStamp: u64,
-    arguments: Vec<String>,
-    filename: String,
-    lineNumber: usize,
-    columnNumber: usize,
-}
-
-#[derive(Serialize)]
-struct PageErrorMsg {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-    pageError: PageError,
-}
-
 #[derive(Serialize)]
 struct NetworkEventMsg {
     from: String,