Skip to content

Commit 19fe936

Browse files
committed
Update for rustc
1 parent f574d17 commit 19fe936

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

src/ffi/list.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ impl List {
3030
self.len += 1;
3131
self.head = unsafe { curl_slist_append(self.head, val.as_ptr()) };
3232
}
33-
}
3433

35-
impl Collection for List {
36-
fn len(&self) -> uint {
34+
pub fn len(&self) -> uint {
3735
self.len
3836
}
3937

40-
fn is_empty(&self) -> bool {
38+
pub fn is_empty(&self) -> bool {
4139
self.len == 0
4240
}
4341
}

src/http/handle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl<'a, 'b> Request<'a, 'b> {
168168
}
169169

170170
pub fn get_header<'a>(&'a self, name: &str) -> Option<&'a [String]> {
171-
self.headers.find_equiv(&name).map(|a| a.as_slice())
171+
self.headers.find_equiv(name).map(|a| a.as_slice())
172172
}
173173

174174
pub fn headers<'c, 'd, I: Iterator<(&'c str, &'d str)>>(mut self, mut hdrs: I) -> Request<'a, 'b> {

src/http/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl Response {
2828

2929
pub fn get_header<'a>(&'a self, name: &str) -> &'a [String] {
3030
self.hdrs
31-
.find_equiv(&name)
31+
.find_equiv(name)
3232
.map(|v| v.as_slice())
3333
.unwrap_or(&[])
3434
}

src/test/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl OpSequenceResult {
210210
pub fn assert(&self) {
211211
match self.rx.recv() {
212212
Ok(_) => {}
213-
Err(e) => fail!("http exchange did not proceed as expected: {}", e)
213+
Err(e) => panic!("http exchange did not proceed as expected: {}", e)
214214
}
215215
}
216216
}

0 commit comments

Comments
 (0)