Update to master

src/codegen/keycode.rs

@@ -6,6 +6,23 @@ struct Key {
     code: uint,
     ident: &'static str,
 }
+impl TotalOrd for Key {
+    fn cmp(&self, other: &Key) -> Ordering {
+        if self.code < other.code {
+            Less
+        } else if self.code > other.code {
+            Greater
+        } else { Equal }
+    }
+}
+impl TotalEq for Key {
+    fn equals(&self, other: &Key) -> bool {
+        if self.code == other.code {
+            true
+        } else { false }
+    }
+}
+
 
 fn Key(code: uint, ident: &'static str) -> Key {
     Key { code: code, ident: ident }
@@ -265,7 +282,7 @@ pub fn generate(output_dir: &Path) {
         Key(1073742106, "SleepKey"),
         ];
 
-        extra::sort::quick_sort(entries, |a, b| a.code <= b.code);
+        entries.sort();
     unsafe {
         longest_ident = entries.iter().map(|&key| key.ident().len()).max_by(|&i| i).unwrap();
     }

src/codegen/main.rs

@@ -1,4 +1,5 @@
 #[feature(macro_rules)];
+#[crate_id = "codegen#0.1"];
 
 use std::os;
 use std::io::buffered::BufferedWriter;
@@ -15,7 +16,7 @@ fn main() {
     match args.len() {
         0 => {
             println("usage: codegen [keycode|scancode].rs destdir");
-            os::set_exit_status(1); 
+            os::set_exit_status(1);
         },
         3 => {
             let output_dir = GenericPath::new(args[2].clone());

src/codegen/scancode.rs

@@ -6,6 +6,22 @@ struct ScanCode {
     code: uint,
     ident: &'static str,
 }
+impl TotalOrd for ScanCode {
+    fn cmp(&self, other: &ScanCode) -> Ordering {
+        if self.code < other.code {
+            Less
+        } else if self.code > other.code {
+            Greater
+        } else { Equal }
+    }
+}
+impl TotalEq for ScanCode {
+    fn equals(&self, other: &ScanCode) -> bool {
+        if self.code == other.code {
+            true
+        } else { false }
+    }
+}
 
 fn ScanCode(code: uint, ident: &'static str) -> ScanCode {
     ScanCode { code: code, ident: ident }
@@ -272,7 +288,7 @@ pub fn generate(output_dir: &Path) {
         ScanCode(512, "NumScanCode"),
         ];
 
-        extra::sort::quick_sort(entries, |a, b| a.code <= b.code);
+        entries.sort();
     unsafe {
         longest_ident = entries.iter().map(|&key| key.ident().len()).max_by(|&i| i).unwrap();
     }

src/sdl2/lib.rs

@@ -1,8 +1,5 @@
-#[link(name = "sdl2",
-       vers = "0.0.1",
-       uuid = "263e35b2-0727-11e3-b3dd-29219a890b3c",
-       url = "http://github.com/AngryLawyer/rust-sdl2")];
-#[crate_id="sdl2"];
+#[crate_id="sdl2#0.0.1"];
+#[crate_type = "lib"];
 
 #[desc = "SDL2 bindings"];
 #[license = "MIT"];