Merge pull request #551 from madsmtm/block-sys-refactor

Merge `block-sys` into `block2`
madsmtm · Jan 7, 2024 · 42bcda9 · 42bcda9
2 parents cf65007 + 056e578
commit 42bcda9
Show file tree

Hide file tree

Showing 22 changed files with 436 additions and 611 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -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`

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/block-sys/CHANGELOG.md b/crates/block-sys/CHANGELOG.md
diff --git a/crates/block-sys/Cargo.toml b/crates/block-sys/Cargo.toml
diff --git a/crates/block-sys/README.md b/crates/block-sys/README.md