Merge pull request #203 from aatxe/master
Fixed compilation for Rust master.
This commit is contained in:
@@ -315,7 +315,7 @@ impl<'a> IntoUrl for &'a str {
|
||||
}
|
||||
|
||||
/// Behavior regarding how to handle redirects within a Client.
|
||||
#[deriving(Copy, Clone)]
|
||||
#[deriving(Copy)]
|
||||
pub enum RedirectPolicy {
|
||||
/// Don't follow any redirects.
|
||||
FollowNone,
|
||||
@@ -325,6 +325,13 @@ pub enum RedirectPolicy {
|
||||
FollowIf(fn(&Url) -> bool),
|
||||
}
|
||||
|
||||
// This is a hack because of upstream typesystem issues.
|
||||
impl Clone for RedirectPolicy {
|
||||
fn clone(&self) -> RedirectPolicy {
|
||||
*self
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for RedirectPolicy {
|
||||
fn default() -> RedirectPolicy {
|
||||
RedirectPolicy::FollowAll
|
||||
|
||||
@@ -3,7 +3,7 @@ use std::io::{Listener, EndOfFile, BufferedReader, BufferedWriter};
|
||||
use std::io::net::ip::{IpAddr, Port, SocketAddr};
|
||||
use std::os;
|
||||
use std::sync::{Arc, TaskPool};
|
||||
use std::task::TaskBuilder;
|
||||
use std::thread::Builder;
|
||||
|
||||
|
||||
pub use self::request::Request;
|
||||
@@ -68,7 +68,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
|
||||
let acceptor = try!(listener.listen());
|
||||
|
||||
let mut captured = acceptor.clone();
|
||||
TaskBuilder::new().named("hyper acceptor").spawn(move || {
|
||||
Builder::new().name("hyper acceptor".into_string()).spawn(move || {
|
||||
let handler = Arc::new(handler);
|
||||
debug!("threads = {}", threads);
|
||||
let pool = TaskPool::new(threads);
|
||||
@@ -126,7 +126,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}).detach();
|
||||
|
||||
Ok(Listening {
|
||||
acceptor: acceptor,
|
||||
|
||||
Reference in New Issue
Block a user