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

Merge block-sys into block2 #551

Merged
merged 4 commits into from
Jan 7, 2024
Merged

Merge block-sys into block2 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27e3e29
Restrict exposed symbols in `block2::ffi` module
madsmtm Jan 6, 2024
d90f062
Don't use `_NSConcreteMallocBlock` in public implementation
madsmtm Jan 6, 2024
40af428
Merge block-sys into block2
madsmtm Jan 7, 2024
056e578
Use ptr::addr_of! to avoid creating references to block ISAs
madsmtm Jan 6, 2024
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: 2 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ env:
#
# This excludes `header-translator`, `test-assembly`, `tests` and `test-ui`.
PUBLIC_CRATES: >-
--package=block-sys
--package=block2
--package=icrate
--package=objc-sys
Expand Down Expand Up @@ -780,10 +779,8 @@ jobs:
- lint

env:
# `compiler-rt` is only relevant for these crates
PUBLIC_CRATES: >-
--package=block-sys
--package=block2
# `compiler-rt` is only relevant for block2
PUBLIC_CRATES: --package=block2

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ Copy and fill out the following checklist into the release PR:
- `objc2-proc-macros`
- `objc-sys`
- `objc2-encode`
- `block-sys`
- `objc2`
- `block2`
- `icrate`
Expand Down
9 changes: 0 additions & 9 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.

70 changes: 0 additions & 70 deletions crates/block-sys/CHANGELOG.md
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions crates/block-sys/Cargo.toml
View file
Open in desktop

This file was deleted.

119 changes: 0 additions & 119 deletions crates/block-sys/README.md
View file
Open in desktop

This file was deleted.

Loading
Loading