diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-05-05 09:11:30 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-05-05 09:11:30 -0500 |
commit | 49aed6555dbc008c1a378c5cbb303f5467232b6b (patch) | |
tree | 9146cdd7126ead59c57cacbaa04eda0f16761f65 /components/net_traits/lib.rs | |
parent | 7b87085c1880c60aa3be5b3ec4572a0d93fd5537 (diff) | |
parent | ef8edd4e87aeb3cc71dfd9da2f69437080f5410e (diff) | |
download | servo-49aed6555dbc008c1a378c5cbb303f5467232b6b.tar.gz servo-49aed6555dbc008c1a378c5cbb303f5467232b6b.zip |
Auto merge of #5935 - servo:rustup_2015-04-25, r=Ms2ger
r? everybody
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5935)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net_traits/lib.rs')
-rw-r--r-- | components/net_traits/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 879643af266..ba9daea4cf4 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -4,8 +4,9 @@ #![feature(box_syntax)] #![feature(collections)] -#![feature(core)] #![feature(rustc_private)] +#![feature(slice_patterns)] +#![feature(step_by)] extern crate geom; extern crate hyper; @@ -22,7 +23,6 @@ use hyper::method::Method; use hyper::mime::{Mime, Attr}; use url::Url; -use std::borrow::IntoCow; use std::sync::mpsc::{channel, Receiver, Sender}; pub mod image_cache_task; @@ -169,7 +169,7 @@ impl Metadata { charset: None, headers: None, // https://fetch.spec.whatwg.org/#concept-response-status-message - status: Some(RawStatus(200, "OK".into_cow())), + status: Some(RawStatus(200, "OK".into())), } } |