More idiomatic usage of objc2

Changes argument and return types that were previously BOOL to bool
servo · Aug 29, 2022 · 01bc687 · 01bc687
1 parent c6dc521
commit 01bc687
Show file tree

Hide file tree

Showing 9 changed files with 571 additions and 582 deletions.
diff --git a/cocoa-foundation/src/base.rs b/cocoa-foundation/src/base.rs
@@ -9,6 +9,7 @@
 
 use objc2::runtime;
 
+#[allow(deprecated)]
 pub use objc2::runtime::{BOOL, NO, YES};
 
 pub type Class = *mut runtime::Class;

diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs
diff --git a/cocoa/examples/color.rs b/cocoa/examples/color.rs
@@ -1,6 +1,6 @@
 extern crate cocoa;
 
-use cocoa::base::{selector, id, nil, NO};
+use cocoa::base::{selector, id, nil};
 
 use cocoa::foundation::{NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo,
                         NSString};
@@ -78,7 +78,7 @@ unsafe fn create_window(title: id, color: id) -> id {
             NSWindowStyleMask::NSMiniaturizableWindowMask |
             NSWindowStyleMask::NSUnifiedTitleAndToolbarWindowMask,
 		NSBackingStoreType::NSBackingStoreBuffered,
-		NO
+		false
 	).autorelease();
 
     window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.));

diff --git a/cocoa/examples/fullscreen.rs b/cocoa/examples/fullscreen.rs
@@ -4,7 +4,7 @@ extern crate core_graphics;
 #[macro_use]
 extern crate objc2;
 
-use cocoa::base::{selector, nil, NO, id};
+use cocoa::base::{selector, nil, id};
 use cocoa::foundation::{NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo,
                         NSString, NSUInteger};
 use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular, NSWindow,
@@ -15,7 +15,7 @@ use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular,
 use core_graphics::display::CGDisplay;
 
 use objc2::runtime::{Object, Sel};
-use objc2::declare::ClassDecl;
+use objc2::declare::ClassBuilder;
 
 fn main() {
     unsafe {
@@ -45,7 +45,7 @@ fn main() {
 
         // Create NSWindowDelegate
         let superclass = class!(NSObject);
-        let mut decl = ClassDecl::new("MyWindowDelegate", superclass).unwrap();
+        let mut decl = ClassBuilder::new("MyWindowDelegate", superclass).unwrap();
 
         extern fn will_use_fillscreen_presentation_options(_: &Object, _: Sel, _: id, _: NSUInteger) -> NSUInteger {
             // Set initial presentation options for fullscreen
@@ -81,7 +81,7 @@ fn main() {
             .initWithContentRect_styleMask_backing_defer_(NSRect::new(NSPoint::new(0., 0.), size),
                                                           NSWindowStyleMask::NSTitledWindowMask,
                                                           NSBackingStoreBuffered,
-                                                          NO)
+                                                          false)
             .autorelease();
         window.setDelegate_(delegate_object);
         let title = NSString::alloc(nil).init_str("Fullscreen!");

diff --git a/cocoa/examples/hello_world.rs b/cocoa/examples/hello_world.rs
@@ -1,6 +1,6 @@
 extern crate cocoa;
 
-use cocoa::base::{selector, nil, NO};
+use cocoa::base::{selector, nil};
 use cocoa::foundation::{NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo,
                         NSString};
 use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular, NSWindow,
@@ -39,7 +39,7 @@ fn main() {
                                                                       NSSize::new(200., 200.)),
                                                           NSWindowStyleMask::NSTitledWindowMask,
                                                           NSBackingStoreBuffered,
-                                                          NO)
+                                                          false)
             .autorelease();
         window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.));
         window.center();

diff --git a/cocoa/examples/tab_view.rs b/cocoa/examples/tab_view.rs
@@ -1,6 +1,6 @@
 extern crate cocoa;
 
-use cocoa::base::{selector, id, nil, NO};
+use cocoa::base::{selector, id, nil};
 
 
 use cocoa::foundation::{NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo,
@@ -71,7 +71,7 @@ unsafe fn create_app(title: id, content: id) -> id {
             NSWindowStyleMask::NSMiniaturizableWindowMask |
             NSWindowStyleMask::NSUnifiedTitleAndToolbarWindowMask,
 		NSBackingStoreType::NSBackingStoreBuffered,
-		NO
+		false
 	).autorelease();
     window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.));
     window.center();