From d39a2cedad749c47e3fabe7701cd1134568e5cfd Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 22 Oct 2016 16:01:26 -0700
Subject: [PATCH] Fix tests

---
 openssl/src/hash.rs           |  4 ++--
 openssl/src/sign.rs           | 16 ++++++++--------
 openssl/src/x509/extension.rs |  4 ++--
 openssl/src/x509/mod.rs       |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/openssl/src/hash.rs b/openssl/src/hash.rs
index 9112ed24..4093ab79 100644
--- a/openssl/src/hash.rs
+++ b/openssl/src/hash.rs
@@ -77,7 +77,7 @@ use self::State::*;
 /// Calculate a hash in one go.
 ///
 /// ```
-/// use openssl::crypto::hash::{hash, MessageDigest};
+/// use openssl::hash::{hash, MessageDigest};
 ///
 /// let data = b"\x42\xF4\x97\xE0";
 /// let spec = b"\x7c\x43\x0f\x17\x8a\xef\xdf\x14\x87\xfe\xe7\x14\x4e\x96\x41\xe2";
@@ -88,7 +88,7 @@ use self::State::*;
 /// Use the `Write` trait to supply the input in chunks.
 ///
 /// ```
-/// use openssl::crypto::hash::{Hasher, MessageDigest};
+/// use openssl::hash::{Hasher, MessageDigest};
 ///
 /// let data = [b"\x42\xF4", b"\x97\xE0"];
 /// let spec = b"\x7c\x43\x0f\x17\x8a\xef\xdf\x14\x87\xfe\xe7\x14\x4e\x96\x41\xe2";
diff --git a/openssl/src/sign.rs b/openssl/src/sign.rs
index 2e88f38f..a1a37ce6 100644
--- a/openssl/src/sign.rs
+++ b/openssl/src/sign.rs
@@ -10,13 +10,13 @@
 //! Sign and verify data given an RSA keypair:
 //!
 //! ```rust
-//! use openssl::crypto::sign::{Signer, Verifier};
-//! use openssl::crypto::rsa::RSA;
-//! use openssl::crypto::pkey::PKey;
-//! use openssl::crypto::hash::MessageDigest;
+//! use openssl::sign::{Signer, Verifier};
+//! use openssl::rsa::Rsa;
+//! use openssl::pkey::PKey;
+//! use openssl::hash::MessageDigest;
 //!
 //! // Generate a keypair
-//! let keypair = RSA::generate(2048).unwrap();
+//! let keypair = Rsa::generate(2048).unwrap();
 //! let keypair = PKey::from_rsa(keypair).unwrap();
 //!
 //! let data = b"hello, world!";
@@ -38,9 +38,9 @@
 //! Compute an HMAC (note that `Verifier` cannot be used with HMACs):
 //!
 //! ```rust
-//! use openssl::crypto::sign::Signer;
-//! use openssl::crypto::pkey::PKey;
-//! use openssl::crypto::hash::MessageDigest;
+//! use openssl::sign::Signer;
+//! use openssl::pkey::PKey;
+//! use openssl::hash::MessageDigest;
 //!
 //! // Create a PKey
 //! let key = PKey::hmac(b"my secret").unwrap();
diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs
index 7ac66383..398bbb3e 100644
--- a/openssl/src/x509/extension.rs
+++ b/openssl/src/x509/extension.rs
@@ -36,10 +36,10 @@ pub enum Extension {
     ///
     /// ```
     /// use openssl::x509::extension::Extension::*;
-    /// use openssl::nid::Nid;
+    /// use openssl::nid;
     ///
     /// # let generator = openssl::x509::X509Generator::new();
-    /// generator.add_extension(OtherNid(Nid::BasicConstraints,"critical,CA:TRUE".to_owned()));
+    /// generator.add_extension(OtherNid(nid::BASIC_CONSTRAINTS,"critical,CA:TRUE".to_owned()));
     /// ```
     OtherNid(Nid, String),
     /// Arbitrary extensions by OID string. See `man ASN1_generate_nconf` for value syntax.
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index 8653b44e..af5c722a 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -130,13 +130,13 @@ impl X509StoreContextRef {
 /// # Example
 ///
 /// ```
-/// use openssl::crypto::hash::MessageDigest;
-/// use openssl::crypto::pkey::PKey;
-/// use openssl::crypto::rsa::RSA;
+/// use openssl::hash::MessageDigest;
+/// use openssl::pkey::PKey;
+/// use openssl::rsa::Rsa;
 /// use openssl::x509::X509Generator;
 /// use openssl::x509::extension::{Extension, KeyUsageOption};
 ///
-/// let rsa = RSA::generate(2048).unwrap();
+/// let rsa = Rsa::generate(2048).unwrap();
 /// let pkey = PKey::from_rsa(rsa).unwrap();
 ///
 /// let gen = X509Generator::new()