From 0417df7ba3021e3f81b3f7ab042770cdc3fb87ef Mon Sep 17 00:00:00 2001 From: michaelwright235 Date: Tue, 6 Jun 2023 16:30:40 +0300 Subject: [PATCH 1/4] Replace deprecated `libc::int32_t` type with `i32` `int32_t` is just an alias of `i32` type. --- core-graphics-types/src/base.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-graphics-types/src/base.rs b/core-graphics-types/src/base.rs index 2a08126..03a85f1 100644 --- a/core-graphics-types/src/base.rs +++ b/core-graphics-types/src/base.rs @@ -26,7 +26,7 @@ pub type CGFloat = libc::c_double; #[cfg(not(target_pointer_width = "64"))] pub type CGFloat = libc::c_float; -pub type CGError = libc::int32_t; +pub type CGError = i32; pub type CGGlyph = libc::c_ushort; From 2c9551d94a7f2d19e07227679f438e9cf9c869be Mon Sep 17 00:00:00 2001 From: michaelwright235 Date: Tue, 6 Jun 2023 16:33:07 +0300 Subject: [PATCH 2/4] cocoa: examples: Remove unused imports --- cocoa/examples/nsvisualeffectview_blur.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocoa/examples/nsvisualeffectview_blur.rs b/cocoa/examples/nsvisualeffectview_blur.rs index 0c6cc94..d20ae54 100644 --- a/cocoa/examples/nsvisualeffectview_blur.rs +++ b/cocoa/examples/nsvisualeffectview_blur.rs @@ -2,11 +2,11 @@ extern crate cocoa; extern crate objc; use objc::*; -use cocoa::base::{selector, id, nil, NO}; +use cocoa::base::{selector, nil, NO}; use cocoa::foundation::{NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo, NSString}; -use cocoa::appkit::{NSApp, NSColor, NSColorSpace, NSApplication, NSApplicationActivationPolicyRegular, NSMenu, NSMenuItem, NSWindowStyleMask, NSBackingStoreType, NSWindow, NSRunningApplication, NSApplicationActivateIgnoringOtherApps, NSView, NSVisualEffectMaterial, NSVisualEffectView, NSViewWidthSizable, NSViewHeightSizable, NSVisualEffectBlendingMode, NSVisualEffectState, NSWindowOrderingMode}; +use cocoa::appkit::{NSApp, NSColor, NSApplication, NSApplicationActivationPolicyRegular, NSMenu, NSMenuItem, NSWindowStyleMask, NSBackingStoreType, NSWindow, NSView, NSVisualEffectMaterial, NSVisualEffectView, NSViewWidthSizable, NSViewHeightSizable, NSVisualEffectBlendingMode, NSVisualEffectState, NSWindowOrderingMode}; fn main() { From 6b252cf1fca13bcaa4e23aa8b6acba599db104bf Mon Sep 17 00:00:00 2001 From: michaelwright235 Date: Tue, 6 Jun 2023 16:34:49 +0300 Subject: [PATCH 3/4] cocoa-foundation: Get rid of anonymous parameter It's an error since Rust 2018. --- cocoa-foundation/src/foundation.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs index b9ca8b0..db7092c 100644 --- a/cocoa-foundation/src/foundation.rs +++ b/cocoa-foundation/src/foundation.rs @@ -611,7 +611,7 @@ pub trait NSString: Sized { unsafe fn init_str(self, string: &str) -> Self; unsafe fn UTF8String(self) -> *const libc::c_char; unsafe fn len(self) -> usize; - unsafe fn isEqualToString(self, &str) -> bool; + unsafe fn isEqualToString(self, string: &str) -> bool; unsafe fn substringWithRange(self, range: NSRange) -> id; } From 612ef8f9e561b0ff1402e69ae162cd58716f11c6 Mon Sep 17 00:00:00 2001 From: michaelwright235 Date: Wed, 7 Jun 2023 02:06:54 +0300 Subject: [PATCH 4/4] core-graphics: Assign a value to a `_` variable Compiler thinks that we need to use the value, so we use this workaroud to get rid of a warning. --- core-graphics/src/event.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-graphics/src/event.rs b/core-graphics/src/event.rs index 907e68e..3f2d8c1 100644 --- a/core-graphics/src/event.rs +++ b/core-graphics/src/event.rs @@ -505,7 +505,7 @@ impl<'tap_life> CGEventTap<'tap_life> { callback_ref: Box::from_raw(cbr), }) } else { - Box::from_raw(cbr); + let _ = Box::from_raw(cbr); Err(()) } }