Update uuid to 0.8, import serde_derive through serde

Cargo.toml

@@ -18,12 +18,11 @@ default = ["hyper-native-tls"]
 
 [dependencies]
 chrono = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 hyper-native-tls = { version = "0.3", optional = true }
 hyper = "0.10"
-uuid = { version = "0.7", features = ["serde", "v4"] }
+uuid = { version = "0.8", features = ["serde", "v4"] }
 rustc-serialize = "0.3"
 bitflags = "1.0"
 url = "1.7"

examples/approval_request.rs

@@ -1,7 +1,3 @@
-extern crate env_logger;
-extern crate rustc_serialize;
-extern crate sdkms;
-
 use rustc_serialize::base64::{ToBase64, STANDARD};
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};

examples/crud.rs

@@ -1,8 +1,3 @@
-extern crate chrono;
-extern crate env_logger;
-extern crate rand;
-extern crate sdkms;
-
 use chrono::Local;
 use rand::prelude::*;
 use sdkms::api_model::*;

examples/encrypt_decrypt.rs

@@ -1,6 +1,3 @@
-extern crate env_logger;
-extern crate sdkms;
-
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};
 

examples/get_user.rs

@@ -1,7 +1,3 @@
-extern crate env_logger;
-extern crate sdkms;
-extern crate uuid;
-
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};
 use std::str::FromStr;

examples/invoke_plugin.rs

@@ -1,11 +1,5 @@
-extern crate env_logger;
-extern crate sdkms;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate uuid;
-
 use sdkms::{Error as SdkmsError, SdkmsClient};
+use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use uuid::Uuid;
 

examples/plugin_approval_request.rs

@@ -1,14 +1,7 @@
-extern crate env_logger;
-extern crate rustc_serialize;
-extern crate sdkms;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate uuid;
-
 use rustc_serialize::base64::{ToBase64, STANDARD};
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};
+use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use std::{thread, time};
 use uuid::Uuid;

examples/session.rs

@@ -1,6 +1,3 @@
-extern crate env_logger;
-extern crate sdkms;
-
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};
 

examples/sign_verify.rs

@@ -1,6 +1,3 @@
-extern crate env_logger;
-extern crate sdkms;
-
 use sdkms::api_model::*;
 use sdkms::{Error as SdkmsError, SdkmsClient};
 

src/client.rs

@@ -7,16 +7,10 @@
 use crate::api_model::*;
 use crate::operations::*;
 
-#[cfg(feature = "hyper-native-tls")]
-use hyper::client::Pool;
 use hyper::header::{Authorization, ContentType};
 use hyper::method::Method;
-#[cfg(feature = "hyper-native-tls")]
-use hyper::net::HttpsConnector;
 use hyper::status::StatusCode;
 use hyper::Client as HyperClient;
-#[cfg(feature = "hyper-native-tls")]
-use hyper_native_tls::NativeTlsClient;
 use rustc_serialize::base64::{ToBase64, STANDARD};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -94,6 +88,10 @@ impl SdkmsClientBuilder {
             None => {
                 #[cfg(feature = "hyper-native-tls")]
                 {
+                    use hyper::client::Pool;
+                    use hyper::net::HttpsConnector;
+                    use hyper_native_tls::NativeTlsClient;
+
                     let ssl = NativeTlsClient::new()?;
                     let connector = HttpsConnector::new(ssl);
                     let client = HyperClient::with_connector(Pool::with_connector(

src/generated/accounts_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Type of subscription.
 #[derive(Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]

src/generated/approval_requests_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// A Principal who can approve or deny an approval request.
 #[derive(Copy, PartialEq, Eq, Hash, Debug, Serialize, Deserialize, Clone)]

src/generated/apps_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Operations allowed to be performed by an app.
 pub use self::app_permissions::AppPermissions;

src/generated/common_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Operations allowed to be performed on a given key.
 pub use self::key_operations::KeyOperations;

src/generated/crypto_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// A cryptographic algorithm.
 #[derive(Debug, Eq, PartialEq, Copy, Hash, Serialize, Deserialize, Clone)]

src/generated/external_roles_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Type of an external role.
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]

src/generated/groups_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Group {

src/generated/keys_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 #[derive(Default, Debug, Serialize, Deserialize, Clone)]
 pub struct SobjectRequest {

src/generated/plugins_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Type of a plugin.
 #[derive(Debug, Eq, PartialEq, Copy, Serialize, Deserialize, Clone)]

src/generated/session_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// A challenge used for multi-factor authentication.
 #[derive(Debug, Eq, PartialEq, Serialize, Deserialize, Clone)]

src/generated/users_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// U2F recovery codes.
 #[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]

src/generated/version_generated.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
+use serde::{Deserialize, Serialize};
 
 /// Server mode.
 #[derive(Debug, Eq, PartialEq, Serialize, Deserialize, Clone)]

src/lib.rs

@@ -54,25 +54,8 @@
 //! [REST APIs]: https://www.fortanix.com/api/sdkms/
 //! [Fortanix SDKMS]: https://fortanix.com/products/sdkms/
 
-#[macro_use]
-extern crate serde_derive;
-extern crate rustc_serialize;
-extern crate serde;
-
-extern crate chrono;
-extern crate serde_json;
-extern crate uuid;
-
 #[macro_use]
 extern crate bitflags;
-
-extern crate hyper;
-
-#[cfg(feature = "hyper-native-tls")]
-extern crate hyper_native_tls;
-
-extern crate url;
-
 #[macro_use]
 extern crate log;
 

src/macros.rs

@@ -116,7 +116,7 @@ macro_rules! singleton_backcompat {
             use ::serde;
             use std::result::Result;
             mod normal {
-                use ::serde;
+                use serde::{Deserialize, Serialize};
                 $(#[derive $derives])*
                 #[derive(Serialize, Deserialize)]
                 #[serde(rename_all = "UPPERCASE")]