From f9ed2629040214799b850a74068f41feee0010d5 Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Sun, 21 Dec 2014 10:25:38 -0500 Subject: [PATCH] Fixed compilation for Rust master. --- src/client/mod.rs | 9 ++++++++- src/server/mod.rs | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/client/mod.rs b/src/client/mod.rs index eccb2617..57e27883 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -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 diff --git a/src/server/mod.rs b/src/server/mod.rs index a3fc9039..29ff0bdf 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -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, S: NetworkStream, A: NetworkAcceptor> Server, S: NetworkStream, A: NetworkAcceptor> Server