From 8e162f792c0dcad3e9261fe208debbf8b9eb976f Mon Sep 17 00:00:00 2001 From: Tarik Eshaq Date: Tue, 13 Feb 2024 11:29:23 -0500 Subject: [PATCH] Fix up some internal dependences. Takes the easy bits of #6129 --- Cargo.lock | 7 ------- components/autofill/Cargo.toml | 1 - components/support/sql/Cargo.toml | 1 - components/support/viaduct-reqwest/Cargo.toml | 1 - components/support/viaduct-reqwest/src/lib.rs | 9 --------- components/sync15/Cargo.toml | 1 - components/sync15/src/telemetry.rs | 2 -- components/webext-storage/Cargo.toml | 5 ----- components/webext-storage/build.rs | 7 ------- examples/places-utils/Cargo.toml | 1 - 10 files changed, 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16d7ec497b..6ae004c107 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -250,7 +250,6 @@ dependencies = [ "lazy_static", "libsqlite3-sys", "log", - "nss_build_common", "rusqlite", "serde", "serde_derive", @@ -1317,7 +1316,6 @@ dependencies = [ "cli-support", "ctrlc", "error-support", - "find-places-db", "fxa-client", "interrupt-support", "log", @@ -4144,7 +4142,6 @@ name = "sql-support" version = "0.1.0" dependencies = [ "env_logger", - "ffi-support", "interrupt-support", "lazy_static", "log", @@ -4298,7 +4295,6 @@ dependencies = [ "base64", "env_logger", "error-support", - "ffi-support", "interrupt-support", "lazy_static", "log", @@ -5020,7 +5016,6 @@ dependencies = [ name = "viaduct-reqwest" version = "0.2.0" dependencies = [ - "ffi-support", "log", "once_cell", "reqwest", @@ -5236,9 +5231,7 @@ dependencies = [ "ffi-support", "interrupt-support", "lazy_static", - "libsqlite3-sys", "log", - "nss_build_common", "parking_lot", "rusqlite", "serde", diff --git a/components/autofill/Cargo.toml b/components/autofill/Cargo.toml index 923b9dc1dc..49caf3f9af 100644 --- a/components/autofill/Cargo.toml +++ b/components/autofill/Cargo.toml @@ -32,5 +32,4 @@ env_logger = { version = "0.10", default-features = false } libsqlite3-sys = { workspace = true } [build-dependencies] -nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" } uniffi = { workspace = true, features = ["build"] } diff --git a/components/support/sql/Cargo.toml b/components/support/sql/Cargo.toml index 244c696c74..19892a5d5d 100644 --- a/components/support/sql/Cargo.toml +++ b/components/support/sql/Cargo.toml @@ -14,7 +14,6 @@ debug-tools = ["dep:prettytable-rs", "rusqlite/column_decltype"] log = "0.4" lazy_static = "1.4" interrupt-support = { path = "../interrupt" } -ffi-support = "0.4" thiserror = "1.0" tempfile = "3.1.0" parking_lot = ">=0.11,<=0.12" diff --git a/components/support/viaduct-reqwest/Cargo.toml b/components/support/viaduct-reqwest/Cargo.toml index 5923f6c9ad..091e1f6e5b 100644 --- a/components/support/viaduct-reqwest/Cargo.toml +++ b/components/support/viaduct-reqwest/Cargo.toml @@ -11,7 +11,6 @@ crate-type = ["lib"] [dependencies] viaduct = { path = "../../viaduct" } reqwest = { version = "0.11", features = ["blocking", "native-tls-vendored"] } -ffi-support = "0.4" log = "0.4" once_cell = "1.5" diff --git a/components/support/viaduct-reqwest/src/lib.rs b/components/support/viaduct-reqwest/src/lib.rs index c0cc521827..c964e6c97a 100644 --- a/components/support/viaduct-reqwest/src/lib.rs +++ b/components/support/viaduct-reqwest/src/lib.rs @@ -114,12 +114,3 @@ pub fn use_reqwest_backend() { pub extern "C" fn viaduct_use_reqwest_backend() { use_reqwest_backend(); } - -/// A dummy symbol we include so that we can detect whether or not the reqwest -/// backend got compiled in. -#[no_mangle] -pub extern "C" fn viaduct_detect_reqwest_backend() { - ffi_support::abort_on_panic::call_with_output(|| { - println!("Nothing to see here (reqwest backend available)."); - }); -} diff --git a/components/sync15/Cargo.toml b/components/sync15/Cargo.toml index d764b61429..f38ca45d0f 100644 --- a/components/sync15/Cargo.toml +++ b/components/sync15/Cargo.toml @@ -49,7 +49,6 @@ anyhow = "1.0" base16 = { version = "0.2", optional = true } base64 = { version = "0.21", optional = true } error-support = { path = "../support/error" } -ffi-support = "0.4" interrupt-support = { path = "../support/interrupt" } payload-support = { path = "../support/payload" } lazy_static = "1.4" diff --git a/components/sync15/src/telemetry.rs b/components/sync15/src/telemetry.rs index 06b2cb64fc..9fddd9c2b4 100644 --- a/components/sync15/src/telemetry.rs +++ b/components/sync15/src/telemetry.rs @@ -782,8 +782,6 @@ impl SyncTelemetryPing { } } -ffi_support::implement_into_ffi_by_json!(SyncTelemetryPing); - #[cfg(test)] mod ping_tests { use super::*; diff --git a/components/webext-storage/Cargo.toml b/components/webext-storage/Cargo.toml index e4bf17dcb0..dda20b2c6f 100644 --- a/components/webext-storage/Cargo.toml +++ b/components/webext-storage/Cargo.toml @@ -31,15 +31,10 @@ url = { version = "2.1", features = ["serde"] } [dev-dependencies] env_logger = { version = "0.10", default-features = false } tempfile = "3" -# A *direct* dep on the -sys crate is required for our build.rs -# to see the DEP_SQLITE3_LINK_TARGET env var that cargo sets -# on its behalf. -libsqlite3-sys = { workspace = true } sql-support = { path = "../support/sql" } # We add the perserve_order feature to guarantee ordering of the keys in our # JSON objects as they get serialized/deserialized. serde_json = { version = "1", features = ["preserve_order"] } [build-dependencies] -nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" } uniffi = { workspace = true, features = ["build"] } diff --git a/components/webext-storage/build.rs b/components/webext-storage/build.rs index 7e78567295..77d3a9eb4a 100644 --- a/components/webext-storage/build.rs +++ b/components/webext-storage/build.rs @@ -2,14 +2,7 @@ * 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/. */ -//! Work around the fact that `sqlcipher` might get enabled by a cargo feature -//! another crate in the workspace needs, without setting up nss. (This is a -//! gross hack). fn main() { println!("cargo:rerun-if-changed=build.rs"); - - // If NSS_DIR isn't set, we don't really care, ignore the Err case. - let _ = nss_build_common::link_nss(); - uniffi::generate_scaffolding("./src/webext-storage.udl").unwrap(); } diff --git a/examples/places-utils/Cargo.toml b/examples/places-utils/Cargo.toml index 49da96a9f4..9ea2b23e54 100644 --- a/examples/places-utils/Cargo.toml +++ b/examples/places-utils/Cargo.toml @@ -28,6 +28,5 @@ cli-support = { path = "../cli-support" } structopt = "0.3" fxa-client = { path = "../../components/fxa-client" } tempfile = "3" -find-places-db = { path = "../../components/support/find-places-db" } anyhow = "1.0" ctrlc = "3.2.1"