Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix up some internal dependences. #6412

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fix up some internal dependences. #6412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion components/autofill/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
1 change: 0 additions & 1 deletion components/support/sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion components/support/viaduct-reqwest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

9 changes: 0 additions & 9 deletions components/support/viaduct-reqwest/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was from Tarik - @bendk, do you know whether this is actually safe to remove when considering desktop?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so? I don't see that when I search in searchfox.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks - I hope you mean does look safe to remove, so I'll mark this as ready

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went spelunking, and it looks like Thom added this way back in #937, as a check to ensure that we never included the Reqwest backend in our (then-Android only) Megazords—and which Ed removed in #3191.

ffi_support::abort_on_panic::call_with_output(|| {
println!("Nothing to see here (reqwest backend available).");
});
}
1 change: 0 additions & 1 deletion components/sync15/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions components/sync15/src/telemetry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,6 @@ impl SyncTelemetryPing {
}
}

ffi_support::implement_into_ffi_by_json!(SyncTelemetryPing);

#[cfg(test)]
mod ping_tests {
use super::*;
Expand Down
5 changes: 0 additions & 5 deletions components/webext-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
7 changes: 0 additions & 7 deletions components/webext-storage/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
1 change: 0 additions & 1 deletion examples/places-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading