Просмотр исходного кода

Merge branch 'master' into crates.io

Simon Sapin 11 лет назад
Родитель
Сommit
a392e08107
4 измененных файлов с 5 добавлено и 2 удалено
  1. 1 1
      Cargo.toml
  2. 2 0
      src/encoding.rs
  3. 1 1
      src/lib.rs
  4. 1 0
      src/percent_encoding.rs

+ 1 - 1
Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "url"
-version = "0.2.2"
+version = "0.2.3"
 authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 description = "URL parser for Rust"

+ 2 - 0
src/encoding.rs

@@ -19,6 +19,7 @@ use std::borrow::Cow;
 #[cfg(feature = "query_encoding")] pub use self::encoding::types::EncodingRef;
 
 #[cfg(feature = "query_encoding")]
+#[deriving(Copy)]
 pub struct EncodingOverride {
     /// `None` means UTF-8.
     encoding: Option<EncodingRef>
@@ -68,6 +69,7 @@ impl EncodingOverride {
 
 
 #[cfg(not(feature = "query_encoding"))]
+#[deriving(Copy)]
 pub struct EncodingOverride;
 
 #[cfg(not(feature = "query_encoding"))]

+ 1 - 1
src/lib.rs

@@ -412,7 +412,7 @@ impl<'a> UrlParser<'a> {
 
 
 /// Determines the behavior of the URL parser for a given scheme.
-#[deriving(PartialEq, Eq)]
+#[deriving(PartialEq, Eq, Copy)]
 pub enum SchemeType {
     /// Indicate that the scheme is *non-relative*.
     ///

+ 1 - 0
src/percent_encoding.rs

@@ -27,6 +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.
+#[deriving(Copy)]
 pub struct EncodeSet {
     map: &'static [&'static str, ..256],
 }