Bug 1690469 - [remote] Reorganize Remote Agent Rust module. r=remote-…

…protocol-reviewers,jgraham Depends on D104159 Differential Revision: https://phabricator.services.mozilla.com/D104209
dothq · Feb 5, 2021 · c8e15bb · c8e15bb
1 parent 7cb9dcf
commit c8e15bb
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 23 deletions.
diff --git a/remote/Cargo.toml b/remote/Cargo.toml
diff --git a/remote/components/moz.build b/remote/components/moz.build
@@ -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 http://mozilla.org/MPL/2.0/.
 
+DIRS += [
+    "rust",
+]
+
 XPIDL_MODULE = "remote"
 XPIDL_SOURCES += ["nsIRemoteAgent.idl"]
 

diff --git a/remote/components/rust/Cargo.toml b/remote/components/rust/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "remote"
+version = "0.1.0"
+
+[dependencies]
+http = "0.2"
+libc = "0.2"
+log = "0.4"
+nserror = { path = "../../../xpcom/rust/nserror" }
+nsstring = { path = "../../../xpcom/rust/nsstring" }
+thiserror = "1"
+xpcom = { path = "../../../xpcom/rust/xpcom" }
diff --git a/remote/startup/RemoteAgentHandler.cpp → ...te/components/rust/RemoteAgentHandler.cpp b/remote/startup/RemoteAgentHandler.cpp → ...te/components/rust/RemoteAgentHandler.cpp
diff --git a/remote/startup/RemoteAgentHandler.h → remote/components/rust/RemoteAgentHandler.h b/remote/startup/RemoteAgentHandler.h → remote/components/rust/RemoteAgentHandler.h
diff --git a/remote/startup/moz.build → remote/components/rust/moz.build b/remote/startup/moz.build → remote/components/rust/moz.build
diff --git a/remote/error.rs → remote/components/rust/src/error.rs b/remote/error.rs → remote/components/rust/src/error.rs
diff --git a/remote/startup/handler.rs → remote/components/rust/src/handler.rs b/remote/startup/handler.rs → remote/components/rust/src/handler.rs
diff --git a/remote/lib.rs → remote/components/rust/src/lib.rs b/remote/lib.rs → remote/components/rust/src/lib.rs
@@ -11,8 +11,8 @@ extern crate thiserror;
 extern crate xpcom;
 
 mod error;
+mod handler;
 mod remote_agent;
-mod startup;
 
 pub use crate::error::RemoteAgentError;
 pub use crate::remote_agent::{RemoteAgent, RemoteAgentResult, DEFAULT_HOST, DEFAULT_PORT};
diff --git a/remote/remote_agent.rs → remote/components/rust/src/remote_agent.rs b/remote/remote_agent.rs → remote/components/rust/src/remote_agent.rs
diff --git a/remote/moz.build b/remote/moz.build
@@ -4,7 +4,6 @@
 
 DIRS += [
     "components",
-    "startup",
     "test",
 ]
 

diff --git a/remote/startup/mod.rs b/remote/startup/mod.rs
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
@@ -47,7 +47,7 @@ neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu_bindings = { path = "../../../../gfx/wgpu_bindings", optional = true }
 mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", rev = "578d7058a638c955a597f035ce1a11049c3021d7" }
-remote = { path = "../../../../remote", optional = true }
+remote = { path = "../../../../remote/components/rust", optional = true }
 fog_control = { path = "../../../components/glean", optional = true }
 app_services_logger = { path = "../../../../services/common/app_services_logger" }
 http_sfv = { path = "../../../../netwerk/base/http-sfv" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     DIRS += [
         "components",
-        "startup",
         "test",
     ]
@@ Expand Down @@