specifying return type for msg_send!

rust-windowing · Apr 24, 2018 · c657566 · c657566
1 parent a12eea7
commit c657566
Showing 1 changed file with 11 additions and 21 deletions.
diff --git a/src/platform/macos/window.rs b/src/platform/macos/window.rs
@@ -422,7 +422,7 @@ impl WindowDelegate {
             (&mut **delegate).set_ivar("winitState", state_ptr as *mut ::std::os::raw::c_void);
             let _: () = msg_send![*state.window, setDelegate:*delegate];
 
-            msg_send![autoreleasepool, drain];
+            let _: () = msg_send![autoreleasepool, drain];
 
             WindowDelegate { state: state, _this: delegate }
         }
@@ -437,7 +437,7 @@ impl Drop for WindowDelegate {
             // and then autoreleases it, so autorelease pool is needed
             let autoreleasepool = NSAutoreleasePool::new(cocoa::base::nil);
             let _: () = msg_send![*self.state.window, setDelegate:nil];
-            msg_send![autoreleasepool, drain];
+            let _: () = msg_send![autoreleasepool, drain];
         }
     }
 }
@@ -499,9 +499,7 @@ impl Drop for Window2 {
             }
         }
 
-        unsafe {
-            msg_send![autoreleasepool, release];
-        }
+        let _: () = unsafe { msg_send![autoreleasepool, drain] };
     }
 }
 
@@ -535,27 +533,21 @@ impl Window2 {
         let app = match Window2::create_app(pl_attribs.activation_policy) {
             Some(app) => app,
             None      => {
-                unsafe {
-                    msg_send![autoreleasepool, drain];
-                }
+                let _: () = unsafe { msg_send![autoreleasepool, drain] };
                 return Err(OsError(format!("Couldn't create NSApplication"))); },
         };
 
         let window = match Window2::create_window(win_attribs, pl_attribs)
         {
             Some(window) => window,
             None         => {
-                unsafe {
-                    msg_send![autoreleasepool, drain];
-                }
+                let _: () = unsafe { msg_send![autoreleasepool, drain] };
                 return Err(OsError(format!("Couldn't create NSWindow"))); },
         };
         let view = match Window2::create_view(*window) {
             Some(view) => view,
             None       => {
-                unsafe {
-                    msg_send![autoreleasepool, drain];
-                }
+                let _: () = unsafe { msg_send![autoreleasepool, drain] };
                 return Err(OsError(format!("Couldn't create NSView"))); },
         };
 
@@ -622,9 +614,7 @@ impl Window2 {
             window.delegate.state.perform_maximized(win_attribs.maximized);
         }
 
-        unsafe {
-            msg_send![autoreleasepool, drain];
-        }
+        let _: () = unsafe { msg_send![autoreleasepool, drain] };
 
         Ok(window)
     }
@@ -758,7 +748,7 @@ impl Window2 {
                 window.center();
                 window
             });
-            msg_send![autoreleasepool, drain];
+            let _: () = msg_send![autoreleasepool, drain];
             res
         }
     }
@@ -1133,11 +1123,11 @@ impl IdRef {
 impl Drop for IdRef {
     fn drop(&mut self) {
         if self.0 != nil {
-            let _: () = unsafe {
+            unsafe {
                 let autoreleasepool =
                     NSAutoreleasePool::new(cocoa::base::nil);
-                msg_send![self.0, release];
-                msg_send![autoreleasepool, release];
+                let _ : () = msg_send![self.0, release];
+                let _ : () = msg_send![autoreleasepool, release];
             };
         }
     }