Skip to content

Commit 3bf4c5e

Browse files
committed
Merge pull request #288 from hyperium/rustup
fix(rustup): switch to unstable features
2 parents 4ad4c49 + 3af8b68 commit 3bf4c5e

File tree

15 files changed

+20
-19
lines changed

15 files changed

+20
-19
lines changed

benches/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(core, io, test)]
22
extern crate hyper;
33

44
extern crate test;

benches/client_mock_tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(core, collections, io, test)]
22
extern crate hyper;
33

44
extern crate test;

benches/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(io, test)]
22
extern crate hyper;
33
extern crate test;
44

@@ -26,7 +26,7 @@ fn bench_hyper(b: &mut Bencher) {
2626
let server = hyper::Server::http(Ipv4Addr(127, 0, 0, 1), 0);
2727
let mut listener = server.listen(hyper_handle).unwrap();
2828

29-
let url = hyper::Url::parse(format!("http://{}", listener.socket).as_slice()).unwrap();
29+
let url = hyper::Url::parse(&*format!("http://{}", listener.socket)).unwrap();
3030
b.iter(|| request(url.clone()));
3131
listener.close().unwrap();
3232
}

examples/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(os, io)]
22
extern crate hyper;
33

44
use std::os;

examples/hello.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(io)]
22
extern crate hyper;
33

44
use std::old_io::net::ip::Ipv4Addr;

examples/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(unstable)]
1+
#![feature(core, io)]
22
extern crate hyper;
33
#[macro_use] extern crate log;
44

@@ -21,7 +21,7 @@ macro_rules! try_return(
2121

2222
fn echo(mut req: Request, mut res: Response) {
2323
match req.uri {
24-
AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
24+
AbsolutePath(ref path) => match (&req.method, &path[]) {
2525
(&Get, "/") | (&Get, "/echo") => {
2626
let out = b"Try POST /echo";
2727

src/header/common/access_control/allow_headers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use header;
1010
/// > during the actual request.
1111
///
1212
/// Spec: www.w3.org/TR/cors/#access-control-allow-headers-response-header
13-
#[derive(Clone, PartialEq, Show)]
13+
#[derive(Clone, PartialEq, Debug)]
1414
pub struct AccessControlAllowHeaders(pub Vec<String>);
1515

1616
impl header::Header for AccessControlAllowHeaders {

src/header/common/access_control/allow_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use method;
1111
/// > actual request.
1212
///
1313
/// Spec: www.w3.org/TR/cors/#access-control-allow-methods-response-header
14-
#[derive(Clone, PartialEq, Show)]
14+
#[derive(Clone, PartialEq, Debug)]
1515
pub struct AccessControlAllowMethods(pub Vec<method::Method>);
1616

1717
impl header::Header for AccessControlAllowMethods {

src/header/common/access_control/allow_origin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use header;
1313
/// > "*", or "null" in the response.
1414
///
1515
/// Spec: www.w3.org/TR/cors/#access-control-allow-origin-response-header
16-
#[derive(Clone, PartialEq, Show)]
16+
#[derive(Clone, PartialEq, Debug)]
1717
pub enum AccessControlAllowOrigin {
1818
/// Allow all origins
1919
AllowStar,

src/header/common/access_control/max_age.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use header;
99
/// > preflight request can be cached in a preflight result cache.
1010
///
1111
/// Spec: www.w3.org/TR/cors/#access-control-max-age-response-header
12-
#[derive(Clone, Copy, PartialEq, Show)]
12+
#[derive(Clone, Copy, PartialEq, Debug)]
1313
pub struct AccessControlMaxAge(pub u32);
1414

1515
impl header::Header for AccessControlMaxAge {

0 commit comments

Comments
 (0)