Skip to content

Commit

Permalink
Merge #1352
Browse files Browse the repository at this point in the history
1352: Run `uniffi-bindgen` command instead of depending on `uniffi_bindgen` crates r=messense a=messense

`uniffi_bindgen` crate is too heavy weight and people uses `uniffi` usually have already installed uniffi-bindgen.

Part of #1337, reduces `--no-default-features` compile time on M2 MacBook Air from 26.2s to 22.3s.

Co-authored-by: messense <messense@icloud.com>
  • Loading branch information
bors[bot] and messense authored Dec 13, 2022
2 parents e7b8c22 + 7d19d79 commit cdc3251
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 242 deletions.
3 changes: 3 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ macos_arm64_task:
- cat Cargo.lock
install_script:
- brew install python3
- python3 -m pip install uniffi-bindgen
<<: *BUILD_AND_TEST

linux_aarch64_task:
Expand All @@ -73,4 +74,6 @@ linux_aarch64_task:
fingerprint_script:
- echo $CIRRUS_OS
- cat Cargo.lock
install_script:
- python3 -m pip install uniffi-bindgen
<<: *BUILD_AND_TEST
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
if: ${{ !contains(matrix.python-version, 'pypy') }}
run: pip install cffi
- name: Install python packages
run: pip install virtualenv ziglang~=0.10.0 twine
run: pip install virtualenv ziglang~=0.10.0 twine uniffi-bindgen
- uses: dtolnay/rust-toolchain@stable
id: rustup
with:
Expand Down
190 changes: 14 additions & 176 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ glob = "0.3.0"
cargo_metadata = "0.15.2"
cargo-options = "0.5.2"
cbindgen = { version = "0.24.2", default-features = false }
uniffi_bindgen = "0.21.0"
flate2 = "1.0.18"
goblin = "0.6.0"
platform-info = "1.0.0"
Expand Down Expand Up @@ -88,6 +87,7 @@ indoc = "1.0.3"
pretty_assertions = "1.3.0"
rustversion = "1.0.9"
trycmd = "0.14.0"
which = "4.3.0"

[features]
default = ["full", "rustls"]
Expand Down
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* **Breaking Change**: Remove deprecated `sdist-include` option in `pyproject.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
* **Breaking Change**: Remove deprecated `python-source` option in `Cargo.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
* **Breaking Change**: Turn `patchelf` version warning into a hard error in [#1335](https://github.com/PyO3/maturin/pull/1335)
* **Breaking Change**: [`uniffi_bindgen` CLI](https://mozilla.github.io/uniffi-rs/tutorial/Prerequisites.html#the-uniffi-bindgen-cli-tool) is required for building `uniffi` bindings wheels in [#1352](https://github.com/PyO3/maturin/pull/1352)
* Allow Rust crate to be placed outside of the directory containing `pyproject.toml` in [#1347](https://github.com/PyO3/maturin/pull/1347)

## [0.14.5] - 2022-12-08
Expand Down
Loading

0 comments on commit cdc3251

Please sign in to comment.