Merge pull request http-rs#13 from Nercury/update-to-latest-master

Update to latest master.

Author: alexcrichton

src/lib.rs

@@ -3,10 +3,12 @@
 use nfa::NFA;
 use nfa::CharacterClass;
 use std::collections::BTreeMap;
+use std::cmp::Ordering;
+use std::ops::Index;
 
 pub mod nfa;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Metadata {
     statics: int,
     dynamics: int,
@@ -23,19 +25,19 @@ impl Metadata {
 impl Ord for Metadata {
     fn cmp(&self, other: &Metadata) -> Ordering {
         if self.stars > other.stars {
-            Less
+            Ordering::Less
         } else if self.stars < other.stars {
-            Greater
+            Ordering::Greater
         } else if self.dynamics > other.dynamics {
-            Less
+            Ordering::Less
         } else if self.dynamics < other.dynamics {
-            Greater
+            Ordering::Greater
         } else if self.statics > other.statics {
-            Less
+            Ordering::Less
         } else if self.statics < other.statics {
-            Greater
+            Ordering::Greater
         } else {
-            Equal
+            Ordering::Equal
         }
     }
 }
@@ -54,7 +56,7 @@ impl PartialEq for Metadata {
 
 impl Eq for Metadata {}
 
-#[deriving(PartialEq, Clone, Show)]
+#[derive(PartialEq, Clone, Show)]
 pub struct Params {
     map: BTreeMap<String, String>
 }
@@ -93,7 +95,7 @@ impl<T> Match<T> {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct Router<T> {
     nfa: NFA<Metadata>,
     handlers: BTreeMap<uint, T>

src/nfa.rs

@@ -3,9 +3,9 @@ use std::u64;
 use self::CharacterClass::{Ascii, ValidChars, InvalidChars};
 
 #[cfg(test)] use test;
-#[cfg(test)] use std::collections::TreeSet;
+#[cfg(test)] use std::collections::BTreeSet;
 
-#[deriving(PartialEq, Eq, Clone)]
+#[derive(PartialEq, Eq, Clone)]
 pub struct CharSet {
     low_mask: u64,
     high_mask: u64,
@@ -46,7 +46,7 @@ impl CharSet {
     }
 }
 
-#[deriving(PartialEq, Eq, Clone)]
+#[derive(PartialEq, Eq, Clone)]
 pub enum CharacterClass {
     Ascii(u64, u64, bool),
     ValidChars(CharSet),
@@ -123,7 +123,7 @@ impl CharacterClass {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Thread {
     state: uint,
     captures: Vec<(uint, uint)>,
@@ -151,7 +151,7 @@ impl Thread {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct State<T> {
     pub index: uint,
     pub chars: CharacterClass,
@@ -193,7 +193,7 @@ impl<'a> Match<'a> {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct NFA<T> {
     states: Vec<State<T>>,
     start_capture: Vec<bool>,
@@ -584,8 +584,8 @@ fn bench_hash_set(b: &mut test::Bencher) {
 }
 
 #[bench]
-fn bench_tree_set(b: &mut test::Bencher) {
-    let mut set = TreeSet::new();
+fn bench_btree_set(b: &mut test::Bencher) {
+    let mut set = BTreeSet::new();
     set.insert('p');
     set.insert('n');
     set.insert('/');
@@ -606,4 +606,3 @@ fn valid(char: char) -> CharacterClass {
 fn invalid(char: char) -> CharacterClass {
     CharacterClass::invalid_char(char)
 }
-