From adaa81ec97f08687a2a980a719a26b039003faa4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 2 Apr 2015 18:16:00 -0700 Subject: [PATCH] Prep for beta Add some derive(Clone) and remove the unnecessary convert feature --- src/encoding.rs | 2 +- src/lib.rs | 5 +---- src/percent_encoding.rs | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/encoding.rs b/src/encoding.rs index 87674219..0eb51fb8 100644 --- a/src/encoding.rs +++ b/src/encoding.rs @@ -70,7 +70,7 @@ impl EncodingOverride { #[cfg(not(feature = "query_encoding"))] -#[derive(Copy)] +#[derive(Copy, Clone)] pub struct EncodingOverride; #[cfg(not(feature = "query_encoding"))] diff --git a/src/lib.rs b/src/lib.rs index e6146942..03f8f102 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -118,9 +118,6 @@ assert!(css_url.serialize() == "http://servo.github.io/rust-url/main.css".to_str */ - -#![feature(convert)] - extern crate rustc_serialize; #[macro_use] @@ -406,7 +403,7 @@ impl<'a> UrlParser<'a> { /// Determines the behavior of the URL parser for a given scheme. -#[derive(PartialEq, Eq, Copy, Debug)] +#[derive(PartialEq, Eq, Copy, Debug, Clone)] pub enum SchemeType { /// Indicate that the scheme is *non-relative*. /// diff --git a/src/percent_encoding.rs b/src/percent_encoding.rs index 693c3512..02765f2d 100644 --- a/src/percent_encoding.rs +++ b/src/percent_encoding.rs @@ -27,7 +27,7 @@ mod encode_sets; /// If you need a different encode set, /// please [file a bug](https://github.com/servo/rust-url/issues) /// explaining the use case. -#[derive(Copy)] +#[derive(Copy, Clone)] pub struct EncodeSet { map: &'static [&'static str; 256], }