Merge branch 'main' into update_bitflags

.github/workflows/rust.yml

@@ -2,30 +2,53 @@ name: Rust
 
 on:
   push:
-    branches: ["**"]
+    branches: [main]
   pull_request:
     branches: ["**"]
+  merge_group:
+    types: [checks_requested]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  rustfmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+      - run: cargo fmt --check
+  semver:
+    runs-on: macos-11.0
+    steps:
+    - uses: actions/checkout@v4
+    - name: Check semver
+      uses: obi1kenobi/cargo-semver-checks-action@v2
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11.0, macos-10.15]
+        os: [macos-11.0, macos-12, macos-13]
+        toolchain: [stable, 1.56.1]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Install toolchain
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.toolchain }}
     - name: Build
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
   build_result:
-    name: homu build finished
+    name: Result
     runs-on: ubuntu-latest
     needs:
       - "build"
+      - "semver"
     steps:
       - name: Mark the job as successful
         run: exit 0

clippy.toml

@@ -0,0 +1 @@
+doc-valid-idents = ["CoreFoundation", ".."]

cocoa-foundation/Cargo.toml

@@ -4,9 +4,10 @@ name = "cocoa-foundation"
 description = "Bindings to Cocoa Foundation for macOS"
 homepage = "https://github.com/servo/core-foundation-rs"
 repository = "https://github.com/servo/core-foundation-rs"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
+edition = "2018"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
@@ -15,7 +16,12 @@ default-target = "x86_64-apple-darwin"
 block = "0.1"
 bitflags = "2.2.1"
 libc = "0.2"
-core-foundation = { path = "../core-foundation", version = "0.9" }
-core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
-foreign-types = "0.3"
+core-foundation = { default-features = false, path = "../core-foundation", version = "0.9" }
+core-graphics-types = { default-features = false, path = "../core-graphics-types", version = "0.1" }
 objc = "0.2.3"
+
+[features]
+default = ["link"]
+# Disable to manually link. Enabled by default.
+link = ["core-foundation/link", "core-graphics-types/link"]
+

cocoa-foundation/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

cocoa-foundation/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT