Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 8 deletions

diff --git a/src/bn/mod.rs b/src/bn/mod.rs
index 137adc43..da14d367 100644
--- a/src/bn/mod.rs
+++ b/src/bn/mod.rs
@@ -1,13 +1,14 @@
 use libc::{c_int, c_ulong, c_void};
-use std::{fmt, ptr};
 use std::c_str::CString;
+use std::cmp::Ordering;
+use std::{fmt, ptr};
 
 use ffi;
 use ssl::error::SslError;
 
 pub struct BigNum(*mut ffi::BIGNUM);
 
-#[deriving(Copy)]
+#[derive(Copy)]
 #[repr(C)]
 pub enum RNGProperty {
     MsbMaybeZero = -1,
@@ -371,11 +372,11 @@ impl BigNum {
         unsafe {
             let res = ffi::BN_ucmp(self.raw(), oth.raw()) as i32;
             if res < 0 {
-                Less
+                Ordering::Less
             } else if res > 0 {
-                Greater
+                Ordering::Greater
             } else {
-                Equal
+                Ordering::Equal
             }
         }
     }
@@ -466,11 +467,11 @@ impl PartialOrd for BigNum {
             let v = ffi::BN_cmp(self.raw(), oth.raw());
             let ret =
                 if v == 0 {
-                    Equal
+                    Ordering::Equal
                 } else if v < 0 {
-                    Less
+                    Ordering::Less
                 } else {
-                    Greater
+                    Ordering::Greater
                 };
             Some(ret)
         }
@@ -488,6 +489,7 @@ impl Drop for BigNum {
 }
 
 pub mod unchecked {
+    use std::ops::{Add, Div, Mul, Neg, Rem, Shl, Shr, Sub};
     use ffi;
     use super::{BigNum};