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

Disallow uniffi bin bindings #1353

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Disallow uniffi bin bindings #1353

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
12 changes: 10 additions & 2 deletions src/build_options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,10 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
} else if bindings == "uniffi" {
BridgeModel::UniFfi
} else if bindings == "bin" {
BridgeModel::Bin(find_bindings(&deps, &packages))
// uniffi bindings don't support bin
let bindings =
find_bindings(&deps, &packages).filter(|(bindings, _)| bindings != "uniffi");
BridgeModel::Bin(bindings)
} else {
if !deps.contains_key(bindings) {
bail!(
Expand All @@ -919,7 +922,12 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
}
} else if let Some((bindings, minor)) = find_bindings(&deps, &packages) {
if !targets.contains(&"cdylib") && targets.contains(&"bin") {
BridgeModel::Bin(Some((bindings, minor)))
if bindings == "uniffi" {
// uniffi bindings don't support bin
BridgeModel::Bin(None)
} else {
BridgeModel::Bin(Some((bindings, minor)))
}
} else if bindings == "uniffi" {
BridgeModel::UniFfi
} else {
Expand Down