From 4483b815f6fb9323410f8b5642bd73d41e82f07b Mon Sep 17 00:00:00 2001 From: Sebastian Imlay Date: Sun, 21 Aug 2022 01:19:06 -0400 Subject: [PATCH] fix ci --- .github/workflows/ci.yml | 2 +- src/image/image.rs | 2 +- src/image/uikit.rs | 4 ++-- src/layout/constraint.rs | 2 -- src/lib.rs | 2 -- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 903dcbb..8e695de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: args: --example ios-beta --no-default-features --features uikit,autolayout ios: - name: Check that examples build + name: Check that iOS tests pass via dinghy. runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/src/image/image.rs b/src/image/image.rs index 2272c3e..a3b6c7b 100644 --- a/src/image/image.rs +++ b/src/image/image.rs @@ -1,4 +1,4 @@ -use objc::runtime::{Object, Class}; +use objc::runtime::{Class, Object}; use objc_id::ShareId; use objc::{class, msg_send, sel, sel_impl}; diff --git a/src/image/uikit.rs b/src/image/uikit.rs index 57d796f..413bca7 100644 --- a/src/image/uikit.rs +++ b/src/image/uikit.rs @@ -5,10 +5,10 @@ use objc::runtime::{Class, Object, Sel, BOOL}; use objc::{class, sel, sel_impl}; use objc_id::Id; -use crate::foundation::{id, YES, NO, NSUInteger}; use crate::dragdrop::DragInfo; -use crate::view::{VIEW_DELEGATE_PTR, ViewDelegate}; +use crate::foundation::{id, NSUInteger, NO, YES}; use crate::utils::load; +use crate::view::{ViewDelegate, VIEW_DELEGATE_PTR}; /// Injects an `NSView` subclass. This is used for the default views that don't use delegates - we /// have separate classes here since we don't want to waste cycles on methods that will never be diff --git a/src/layout/constraint.rs b/src/layout/constraint.rs index 37b5571..2b6df12 100644 --- a/src/layout/constraint.rs +++ b/src/layout/constraint.rs @@ -103,7 +103,6 @@ impl LayoutConstraint { pub fn activate(constraints: &[LayoutConstraint]) { let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect(); unsafe { - let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()]; let _: () = msg_send![class!(NSLayoutConstraint), activateConstraints: constraints]; } @@ -112,7 +111,6 @@ impl LayoutConstraint { pub fn deactivate(constraints: &[LayoutConstraint]) { let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect(); unsafe { - let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()]; let _: () = msg_send![class!(NSLayoutConstraint), deactivateConstraints: constraints]; } diff --git a/src/lib.rs b/src/lib.rs index a85779f..decd711 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -143,8 +143,6 @@ pub mod image; #[cfg(feature = "appkit")] pub mod input; pub(crate) mod invoker; -#[cfg(test)] -mod tests; pub mod keys;