Remove librustrt, audio Task

Due to recent changes, librustrt and Task are now deprecated.
Calling Rust from C should now "just work".

Author: nukep

src/sdl2/audio.rs

@@ -7,7 +7,6 @@ use std::c_vec::CVec;
 use libc;
 use libc::{c_int, size_t, c_void};
 use libc::{uint8_t};
-use rustrt::task::Task;
 
 use get_error;
 use rwops::RWops;
@@ -246,39 +245,9 @@ pub trait AudioCallback<T> {
 
 /// The userdata as seen by the SDL callback.
 struct AudioCallbackUserdata<CB> {
-    task: AudioCallbackTask,
     callback: CB
 }
 
-/// A Task is required to use libstd from SDL's audio callback.
-struct AudioCallbackTask {
-    /// Set to None if there was an error running a previous task.
-    task: Option<Box<Task>>
-}
-
-impl Drop for AudioCallbackTask {
-    /// Destroy the callback task.
-    fn drop(&mut self) {
-        use rustrt::local::Local;
-        use std::mem::replace;
-
-        // Swap out the task with None in order to own it, since drop() only
-        // provides a reference.
-        match replace(&mut self.task, None) {
-            Some(task) => {
-                // pop current task
-                let old_task = Local::take();
-
-                task.destroy();
-
-                // put task back
-                Local::put(old_task);
-            },
-            None => ()
-        };
-    }
-}
-
 /// A phantom type for retreiving the SDL_AudioFormat of a given generic type.
 /// All format types are returned as native-endian.
 ///
@@ -329,25 +298,7 @@ extern "C" fn audio_callback_marshall<T: AudioFormatNum<T>, CB: AudioCallback<T>
             len: len as uint / size_of::<T>()
         });
 
-        // Perform a dance to move tasks around without compiler errors
-        let new_task = match replace(&mut cb_userdata.task.task, None) {
-            Some(task) => {
-                let n = task.run(|| {
-                    cb_userdata.callback.callback(buf);
-                });
-
-                if n.is_destroyed() { None }
-                else { Some(n) }
-            },
-            None => {
-                // Last callback had an error. Fill buffer with silence.
-                for x in buf.iter_mut() { *x = AudioFormatNum::zero(); }
-
-                None
-            }
-        };
-
-        replace(&mut cb_userdata.task.task, new_task);
+        cb_userdata.callback.callback(buf);
     }
 }
 
@@ -377,11 +328,7 @@ impl<T: AudioFormatNum<T>, CB: AudioCallback<T>> AudioSpecDesired<T, CB> {
     }
 
     fn callback_to_userdata(callback: CB) -> Box<AudioCallbackUserdata<CB>> {
-        let mut task = box Task::new(None, None);
-        task.name = Some("SDL audio callback".into_cow());
-
         box AudioCallbackUserdata {
-            task: AudioCallbackTask { task: Some(task) },
             callback: callback
         }
     }

src/sdl2/lib.rs

@@ -5,7 +5,6 @@
 
 extern crate libc;
 extern crate collections;
-extern crate rustrt;
 
 pub use sdl::*;