Merge remote-tracking branch 'tomaka/master'

Author: carllerche

src/ffi/list.rs

@@ -30,14 +30,12 @@ impl List {
         self.len += 1;
         self.head = unsafe { curl_slist_append(self.head, val.as_ptr()) };
     }
-}
 
-impl Collection for List {
-    fn len(&self) -> uint {
+    pub fn len(&self) -> uint {
         self.len
     }
 
-    fn is_empty(&self) -> bool {
+    pub fn is_empty(&self) -> bool {
         self.len == 0
     }
 }

src/test/server.rs

@@ -210,7 +210,7 @@ impl OpSequenceResult {
     pub fn assert(&self) {
         match self.rx.recv() {
             Ok(_) => {}
-            Err(e) => fail!("http exchange did not proceed as expected: {}", e)
+            Err(e) => panic!("http exchange did not proceed as expected: {}", e)
         }
     }
 }