Make objc2 optional in core-graphics-types

servo · Jul 31, 2023 · cc744a2 · cc744a2
1 parent 7383217
commit cc744a2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/cocoa-foundation/Cargo.toml b/cocoa-foundation/Cargo.toml
@@ -16,5 +16,5 @@ block2 = "0.2.0"
 bitflags = "1.0"
 libc = "0.2"
 core-foundation = { path = "../core-foundation", version = "0.9" }
-core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
+core-graphics-types = { path = "../core-graphics-types", version = "0.1", features = ["objc2"] }
 objc2 = "0.4.0"
diff --git a/core-graphics-types/Cargo.toml b/core-graphics-types/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 bitflags = "1.0"
 core-foundation = { path = "../core-foundation", version = "0.9" }
 libc = "0.2"
-objc2 = "0.4.0"
+objc2 = { version = "0.4.0", optional = true }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
diff --git a/core-graphics-types/src/geometry.rs b/core-graphics-types/src/geometry.rs
@@ -10,6 +10,7 @@
 use base::CGFloat;
 use core_foundation::base::TCFType;
 use core_foundation::dictionary::CFDictionary;
+#[cfg(feature = "objc2")]
 use objc2::encode::{Encode, Encoding};
 
 pub const CG_ZERO_POINT: CGPoint = CGPoint { x: 0.0, y: 0.0 };
@@ -40,6 +41,7 @@ pub struct CGSize {
     pub height: CGFloat,
 }
 
+#[cfg(feature = "objc2")]
 unsafe impl Encode for CGSize {
     const ENCODING: Encoding = Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
@@ -66,6 +68,7 @@ pub struct CGPoint {
     pub y: CGFloat,
 }
 
+#[cfg(feature = "objc2")]
 unsafe impl Encode for CGPoint {
     const ENCODING: Encoding = Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
@@ -89,6 +92,7 @@ pub struct CGRect {
     pub size: CGSize,
 }
 
+#[cfg(feature = "objc2")]
 unsafe impl Encode for CGRect {
     const ENCODING: Encoding = Encoding::Struct("CGRect", &[CGPoint::ENCODING, CGSize::ENCODING]);
 }
@@ -158,6 +162,7 @@ pub struct CGAffineTransform {
     pub ty: CGFloat,
 }
 
+#[cfg(feature = "objc2")]
 unsafe impl Encode for CGAffineTransform {
     const ENCODING: Encoding = Encoding::Struct(
         "CGAffineTransform",

diff --git a/core-graphics-types/src/lib.rs b/core-graphics-types/src/lib.rs
@@ -8,6 +8,7 @@
 // except according to those terms.
 
 extern crate core_foundation;
+#[cfg(feature = "objc2")]
 extern crate objc2;
 
 pub mod base;