---

yaml
---
r: 164648
b: refs/heads/auto
c: 2df30a4
h: refs/heads/master
v: v3

Author: Jorge Aparicio

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1d25271e054fdefe5e940ab4cc5e098f47c46966
+refs/heads/auto: 2df30a47e2e0ef563d9ed80cb3cc258cbea0f53a
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libserialize/base64.rs

@@ -19,26 +19,25 @@ use std::fmt;
 use std::error;
 
 /// Available encoding character sets
+#[deriving(Copy)]
 pub enum CharacterSet {
     /// The standard character set (uses `+` and `/`)
     Standard,
     /// The URL safe character set (uses `-` and `_`)
     UrlSafe
 }
 
-impl Copy for CharacterSet {}
-
 /// Available newline types
+#[deriving(Copy)]
 pub enum Newline {
     /// A linefeed (i.e. Unix-style newline)
     LF,
     /// A carriage return and a linefeed (i.e. Windows-style newline)
     CRLF
 }
 
-impl Copy for Newline {}
-
 /// Contains configuration parameters for `to_base64`.
+#[deriving(Copy)]
 pub struct Config {
     /// Character set to use
     pub char_set: CharacterSet,
@@ -50,8 +49,6 @@ pub struct Config {
     pub line_length: Option<uint>
 }
 
-impl Copy for Config {}
-
 /// Configuration for RFC 4648 standard base64 encoding
 pub static STANDARD: Config =
     Config {char_set: Standard, newline: Newline::CRLF, pad: true, line_length: None};
@@ -180,15 +177,14 @@ pub trait FromBase64 for Sized? {
 }
 
 /// Errors that can occur when decoding a base64 encoded string
+#[deriving(Copy)]
 pub enum FromBase64Error {
     /// The input contained a character not part of the base64 format
     InvalidBase64Byte(u8, uint),
     /// The input had an invalid length
     InvalidBase64Length,
 }
 
-impl Copy for FromBase64Error {}
-
 impl fmt::Show for FromBase64Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {

branches/auto/src/libserialize/hex.rs

@@ -61,15 +61,14 @@ pub trait FromHex for Sized? {
 }
 
 /// Errors that can occur when decoding a hex encoded string
+#[deriving(Copy)]
 pub enum FromHexError {
     /// The input contained a character not part of the hex format
     InvalidHexCharacter(char, uint),
     /// The input had an invalid length
     InvalidHexLength,
 }
 
-impl Copy for FromHexError {}
-
 impl fmt::Show for FromHexError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {

branches/auto/src/libserialize/json.rs

@@ -226,7 +226,7 @@ pub type Array = Vec<Json>;
 pub type Object = BTreeMap<string::String, Json>;
 
 /// The errors that can arise while parsing a JSON stream.
-#[deriving(Clone, PartialEq)]
+#[deriving(Clone, Copy, PartialEq)]
 pub enum ErrorCode {
     InvalidSyntax,
     InvalidNumber,
@@ -247,17 +247,13 @@ pub enum ErrorCode {
     NotUtf8,
 }
 
-impl Copy for ErrorCode {}
-
-#[deriving(Clone, PartialEq, Show)]
+#[deriving(Clone, Copy, PartialEq, Show)]
 pub enum ParserError {
     /// msg, line, col
     SyntaxError(ErrorCode, uint, uint),
     IoError(io::IoErrorKind, &'static str),
 }
 
-impl Copy for ParserError {}
-
 // Builder and Parser have the same errors.
 pub type BuilderError = ParserError;