Bug 1690469 - [remote] Reorganize Remote Agent Rust module. r=remote-protocol-reviewers,jgraham

Differential Revision: https://phabricator.services.mozilla.com/D104209

remote/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "remote"
-version = "0.1.0"
-
-[lib]
-path = "lib.rs"
-
-[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" }

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"]
 

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" }

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};

remote/moz.build

@@ -4,7 +4,6 @@
 
 DIRS += [
     "components",
-    "startup",
     "test",
 ]
 

remote/startup/mod.rs

@@ -1,5 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// 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/.
-
-mod handler;

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" }