Merge pull request #136 from vhbit/up-master

Updated to master:

4 files changed, 7 insertions, 7 deletions

diff --git a/src/crypto/hash.rs b/src/crypto/hash.rs
index 2a181526..a9711e92 100644
--- a/src/crypto/hash.rs
+++ b/src/crypto/hash.rs
@@ -4,7 +4,7 @@ use std::io;
 
 use ffi;
 
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum HashType {
     MD5,
     SHA1,
diff --git a/src/crypto/hmac.rs b/src/crypto/hmac.rs
index 9e8b6361..03e59c6f 100644
--- a/src/crypto/hmac.rs
+++ b/src/crypto/hmac.rs
@@ -72,7 +72,7 @@ impl Drop for HMAC {
 #[cfg(test)]
 mod tests {
     use serialize::hex::FromHex;
-    use crypto::hash::HashType::{mod, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
+    use crypto::hash::HashType::{self, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
     use super::HMAC;
 
     #[test]
diff --git a/src/crypto/pkey.rs b/src/crypto/pkey.rs
index bab7addc..ac3a407e 100644
--- a/src/crypto/pkey.rs
+++ b/src/crypto/pkey.rs
@@ -6,7 +6,7 @@ use crypto::hash::HashType;
 use ffi;
 use ssl::error::{SslError, StreamError};
 
-#[deriving(Copy)]
+#[derive(Copy)]
 enum Parts {
     Neither,
     Public,
@@ -14,7 +14,7 @@ enum Parts {
 }
 
 /// Represents a role an asymmetric key might be appropriate for.
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Role {
     Encrypt,
     Decrypt,
@@ -23,7 +23,7 @@ pub enum Role {
 }
 
 /// Type of encryption padding to use.
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum EncryptionPadding {
     OAEP,
     PKCS1v15
diff --git a/src/crypto/symm.rs b/src/crypto/symm.rs
index 61365f2e..d1021b37 100644
--- a/src/crypto/symm.rs
+++ b/src/crypto/symm.rs
@@ -2,14 +2,14 @@ use libc::{c_int};
 
 use ffi;
 
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Mode {
     Encrypt,
     Decrypt,
 }
 
 #[allow(non_camel_case_types)]
-#[deriving(Copy)]
+#[derive(Copy)]
 pub enum Type {
     AES_128_ECB,
     AES_128_CBC,