Remove dead code and mark conditionally-dead code

willglynn · willglynn · commit dff60d328701 · 2017-07-23T11:25:03.000-05:00
diff --git a/src/platform/macos/events_loop/mod.rs b/src/platform/macos/events_loop/mod.rs
@@ -5,7 +5,6 @@ use std::sync::{Arc, Mutex, Weak};
 use super::window::{self, Window};
 
 mod nsevent;
-mod timer;
 
 // Simple blocking runloop
 #[cfg(not(feature="context"))]
@@ -16,6 +15,10 @@ mod runloop;
 #[path="runloop_context.rs"]
 mod runloop;
 
+// NSTimer wrapper, needed only for coroutine-baesd runloop
+#[cfg(feature="context")]
+mod timer;
+
 use self::runloop::Runloop;
 
 pub struct EventsLoop {
@@ -54,6 +57,7 @@ impl Shared {
     }
 
     // Are there any events pending delivery?
+    #[allow(dead_code)]
     fn has_queued_events(&self) -> bool {
         !self.pending_events.lock().unwrap().is_empty()
     }
diff --git a/src/platform/macos/events_loop/nsevent.rs b/src/platform/macos/events_loop/nsevent.rs
@@ -18,9 +18,6 @@ impl RetainedEvent {
         unsafe { CFRetain(event as CFTypeRef); }
         RetainedEvent(event)
     }
-    pub fn into_inner(self) -> cocoa::base::id {
-        self.0
-    }
     pub fn id(&self) -> cocoa::base::id {
         self.0
     }
@@ -116,6 +113,7 @@ impl Modifiers {
 //
 // The event itself corresponds to no `Event`, but it does cause `receive_event_from_cocoa()` to
 // return to its caller.
+#[allow(dead_code)]
 pub fn post_event_to_self() {
     unsafe {
         let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
diff --git a/src/platform/macos/events_loop/runloop.rs b/src/platform/macos/events_loop/runloop.rs
@@ -1,7 +1,6 @@
 use std::sync::Weak;
 use core_foundation;
-use cocoa::{self, foundation};
-use cocoa::appkit::{self, NSApplication, NSApp};
+use cocoa;
 
 use super::{Shared,Timeout};
 use super::nsevent;
diff --git a/src/platform/macos/events_loop/runloop_context.rs b/src/platform/macos/events_loop/runloop_context.rs
@@ -5,8 +5,7 @@ use context;
 use core_foundation;
 use core_foundation::base::*;
 use core_foundation::runloop::*;
-use cocoa::{self, foundation};
-use cocoa::appkit::{self, NSApplication, NSApp};
+use cocoa;
 use libc::c_void;
 
 use super::{Shared,Timeout};
diff --git a/src/platform/macos/events_loop/timer.rs b/src/platform/macos/events_loop/timer.rs
@@ -28,7 +28,6 @@ impl Timer {
         // default to firing every year, starting one year in the future
         let interval: CFTimeInterval = interval_seconds;
         let now = unsafe { CFAbsoluteTimeGetCurrent() };
-        let next_interval = now + interval;
 
         let mut context: CFRunLoopTimerContext = unsafe { mem::zeroed() };
 
@@ -54,13 +53,6 @@ impl Timer {
             timer
         }
     }
-
-    // Cause the timer to fire ASAP. Can be called across threads.
-    pub fn trigger(&self) {
-        unsafe {
-            CFRunLoopTimerSetNextFireDate(self.timer, CFAbsoluteTimeGetCurrent());
-        }
-    }
 }
 
 impl Drop for Timer {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ impl Timer {`
`28`	`28`	`// default to firing every year, starting one year in the future`
`29`	`29`	`let interval: CFTimeInterval = interval_seconds;`
`30`	`30`	`let now = unsafe { CFAbsoluteTimeGetCurrent() };`
`31`		`- let next_interval = now + interval;`
`32`	`31`
`33`	`32`	`let mut context: CFRunLoopTimerContext = unsafe { mem::zeroed() };`
`34`	`33`
`@@ -54,13 +53,6 @@ impl Timer {`
`54`	`53`	`timer`
`55`	`54`	`}`
`56`	`55`	`}`
`57`		`-`
`58`		`- // Cause the timer to fire ASAP. Can be called across threads.`
`59`		`- pub fn trigger(&self) {`
`60`		`- unsafe {`
`61`		`- CFRunLoopTimerSetNextFireDate(self.timer, CFAbsoluteTimeGetCurrent());`
`62`		`- }`
`63`		`- }`
`64`	`56`	`}`
`65`	`57`
`66`	`58`	`impl Drop for Timer {`