Merge pull request #13 from peddermaster2/cleanup

Update to rust edition 2018

Author: mikkyang

Cargo.toml

@@ -9,15 +9,15 @@ repository = "http://github.com/mikkyang/rust-jwt"
 readme = "README.md"
 keywords = ["JWT", "token", "web"]
 license = "MIT"
+edition = "2018"
 
 [dependencies]
 base64 = "0.12"
 crypto-mac = "0.8"
 digest = "0.9"
 hmac = "0.8"
 sha2 = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 [dependencies.openssl]

README.md

@@ -26,10 +26,6 @@ Claims can be any `serde::Serialize` type, usually derived with
 `serde_derive`.
 
 ```rust
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::SignWithKey;
 use sha2::Sha256;
@@ -50,10 +46,6 @@ Claims can be any `serde::Deserialize` type, usually derived with
 `serde_derive`.
 
 ```rust
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::VerifyWithKey;
 use sha2::Sha256;
@@ -78,10 +70,6 @@ fields, but any type that implements `JoseHeader` can be used.
 Both header and claims have to implement `serde::Serialize`.
 
 ```rust
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::{AlgorithmType, Header, SignWithKey, Token};
 use sha2::Sha384;
@@ -105,10 +93,6 @@ assert_eq!(token.as_str(), "eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiJzb21lb25lIn0.WM_WnPU
 Both header and claims have to implement `serde::Deserialize`.
 
 ```rust
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::{AlgorithmType, Header, Token, VerifyWithKey};
 use sha2::Sha384;
@@ -137,10 +121,6 @@ For the trait `VerifyWithStore`, the key id from the deserialized header will be
 to use.
 
 ```rust
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::{Header, SignWithStore, Token, VerifyWithStore};
 use sha2::Sha512;

examples/custom_claims.rs

@@ -1,13 +1,7 @@
-extern crate hmac;
-extern crate jwt;
-#[macro_use]
-extern crate serde_derive;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::{Header, SignWithKey, Token, VerifyWithKey};
+use serde::{Deserialize, Serialize};
 use sha2::Sha256;
-use std::default::Default;
 
 #[derive(Default, Deserialize, Serialize)]
 struct Custom {

examples/hs256.rs

@@ -1,11 +1,6 @@
-extern crate hmac;
-extern crate jwt;
-extern crate sha2;
-
 use hmac::{Hmac, NewMac};
 use jwt::{RegisteredClaims, SignWithKey, VerifyWithKey};
 use sha2::Sha256;
-use std::default::Default;
 
 fn new_token(user_id: &str, password: &str) -> Result<String, &'static str> {
     // Dummy auth

examples/hs256_legacy.rs

@@ -1,12 +1,8 @@
 #![allow(deprecated)]
 
-extern crate jwt;
-extern crate sha2;
-
 use jwt::legacy::{Header, Registered, Token};
 use sha2::Digest;
 use sha2::Sha256;
-use std::default::Default;
 
 fn new_token(user_id: &str, password: &str) -> Option<String> {
     // Dummy auth

src/algorithm/mod.rs

@@ -4,15 +4,14 @@
 //! module. The `none` algorithm is explicitly not supported.
 //! ## Examples
 //! ```
-//! extern crate hmac;
-//! extern crate sha2;
-//!
 //! use hmac::{Hmac, NewMac};
 //! use sha2::Sha256;
 //!
 //! let hs256_key: Hmac<Sha256> = Hmac::new_varkey(b"some-secret").unwrap();
 //! ```
 
+use serde::{Deserialize, Serialize};
+
 use crate::error::Error;
 
 #[cfg(feature = "openssl")]

src/algorithm/openssl.rs

@@ -3,9 +3,6 @@
 //! can only be used for verification.
 //! ## Examples
 //! ```
-//! extern crate jwt;
-//! extern crate openssl;
-//!
 //! use jwt::PKeyWithDigest;
 //! use openssl::hash::MessageDigest;
 //! use openssl::pkey::PKey;
@@ -14,12 +11,12 @@
 //!     digest: MessageDigest::sha256(),
 //!     key: PKey::public_key_from_pem(pem).unwrap(),
 //! };
-//!
 //! ```
 
 use crate::algorithm::{AlgorithmType, SigningAlgorithm, VerifyingAlgorithm};
 use crate::error::Error;
 use crate::SEPARATOR;
+
 use openssl::bn::BigNum;
 use openssl::ecdsa::EcdsaSig;
 use openssl::hash::MessageDigest;
@@ -112,11 +109,12 @@ fn jose_to_der(jose: &[u8]) -> Result<Vec<u8>, Error> {
 #[cfg(test)]
 mod tests {
     use crate::algorithm::openssl::PKeyWithDigest;
-    use crate::algorithm::AlgorithmType::{self, *};
+    use crate::algorithm::AlgorithmType::*;
     use crate::algorithm::{SigningAlgorithm, VerifyingAlgorithm};
     use crate::error::Error;
     use crate::header::PrecomputedAlgorithmOnlyHeader as AlgOnly;
     use crate::ToBase64;
+
     use openssl::hash::MessageDigest;
     use openssl::pkey::PKey;
 

src/algorithm/rust_crypto.rs

@@ -2,12 +2,10 @@
 //! According to that organization, only hmac is safely implemented at the
 //! moment.
 
-use base64;
 use crypto_mac::Mac;
 use digest::generic_array::ArrayLength;
 use digest::{BlockInput, FixedOutput, Reset, Update};
 use hmac::Hmac;
-use sha2;
 
 use crate::algorithm::{AlgorithmType, SigningAlgorithm, VerifyingAlgorithm};
 use crate::error::Error;

src/claims.rs

@@ -1,8 +1,9 @@
 //! Convenience structs for commonly defined fields in claims.
 
-use serde_json;
 use std::collections::BTreeMap;
 
+use serde::{Deserialize, Serialize};
+
 /// Generic [JWT claims](https://tools.ietf.org/html/rfc7519#page-8) with
 /// defined fields for registered and private claims.
 #[derive(Debug, Default, PartialEq, Serialize, Deserialize)]

src/error.rs

@@ -1,10 +1,12 @@
-use self::Error::*;
-use crate::algorithm::AlgorithmType;
+use std::fmt;
+use std::string::FromUtf8Error;
+
 use base64::DecodeError;
 use crypto_mac::{InvalidKeyLength, MacError};
 use serde_json::Error as JsonError;
-use std::fmt;
-use std::string::FromUtf8Error;
+
+use self::Error::*;
+use crate::algorithm::AlgorithmType;
 
 #[derive(Debug)]
 pub enum Error {
@@ -52,7 +54,7 @@ impl fmt::Display for Error {
 impl std::error::Error for Error {}
 
 macro_rules! error_wrap {
-    ($f: ty, $e: expr) => {
+    ($f:ty, $e:expr) => {
         impl From<$f> for Error {
             fn from(f: $f) -> Error {
                 $e(f)

src/header.rs

@@ -1,9 +1,12 @@
 //! Convenience structs for commonly defined fields in headers.
 
+use std::borrow::Cow;
+
+use serde::{Deserialize, Serialize};
+
 use crate::algorithm::AlgorithmType;
 use crate::error::Error;
 use crate::ToBase64;
-use std::borrow::Cow;
 
 /// A trait for any header than can conform to the
 /// [JWT specification](https://tools.ietf.org/html/rfc7519#page-11).

src/legacy/claims.rs

@@ -1,6 +1,8 @@
-use serde_json::Value as Json;
 use std::collections::BTreeMap;
 
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+
 #[deprecated(note = "Please use jwt::Claims instead")]
 #[derive(Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct Claims {

src/legacy/header.rs

@@ -1,5 +1,7 @@
 use std::default::Default;
 
+use serde::{Deserialize, Serialize};
+
 #[deprecated(note = "Please use jwt::Header instead")]
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Header {

src/legacy/mod.rs

@@ -1,12 +1,13 @@
 //! Legacy support.
 
+use digest::generic_array::ArrayLength;
+use digest::*;
+use hmac::{Hmac, NewMac};
+
 use crate::algorithm::{self, SigningAlgorithm, VerifyingAlgorithm};
 use crate::error::Error;
 use crate::token::verified::split_components;
 use crate::{FromBase64, ToBase64, SEPARATOR};
-use digest::generic_array::ArrayLength;
-use digest::*;
-use hmac::{Hmac, NewMac};
 
 pub use crate::legacy::claims::Claims;
 pub use crate::legacy::claims::Registered;

src/lib.rs

@@ -8,9 +8,6 @@
 //! Claims can be any `serde::Serialize` type, usually derived with
 //! `serde_derive`.
 //! ```rust
-//! extern crate hmac;
-//! extern crate sha2;
-//!
 //! use hmac::{Hmac, NewMac};
 //! use jwt::SignWithKey;
 //! use sha2::Sha256;
@@ -31,9 +28,6 @@
 //! Claims can be any `serde::Deserialize` type, usually derived with
 //! `serde_derive`.
 //! ```rust
-//! extern crate hmac;
-//! extern crate sha2;
-//!
 //! use hmac::{Hmac, NewMac};
 //! use jwt::VerifyWithKey;
 //! use sha2::Sha256;
@@ -56,9 +50,6 @@
 //! #### Signing
 //! Both header and claims have to implement `serde::Serialize`.
 //! ```rust
-//! extern crate hmac;
-//! extern crate sha2;
-//!
 //! use hmac::{Hmac, NewMac};
 //! use jwt::{AlgorithmType, Header, SignWithKey, Token};
 //! use sha2::Sha384;
@@ -82,9 +73,6 @@
 //! #### Verification
 //! Both header and claims have to implement `serde::Deserialize`.
 //! ```rust
-//! extern crate hmac;
-//! extern crate sha2;
-//!
 //! use hmac::{Hmac, NewMac};
 //! use jwt::{AlgorithmType, Header, Token, VerifyWithKey};
 //! use sha2::Sha384;
@@ -104,27 +92,15 @@
 //! # try_main().unwrap()
 //! ```
 
-extern crate base64;
-extern crate crypto_mac;
-extern crate digest;
-#[cfg(doctest)]
-#[macro_use]
-extern crate doc_comment;
-extern crate hmac;
-#[cfg(feature = "openssl")]
-extern crate openssl;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate sha2;
-
 #[cfg(doctest)]
 doctest!("../README.md");
 
-use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 
+#[cfg(doctest)]
+use doc_comment::doctest;
+use serde::{Deserialize, Serialize};
+
 #[cfg(feature = "openssl")]
 pub use crate::algorithm::openssl::PKeyWithDigest;
 pub use crate::algorithm::store::Store;

src/token/signed.rs

@@ -139,14 +139,17 @@ impl<H, C> Into<String> for Token<H, C, Signed> {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::BTreeMap;
+
+    use hmac::{Hmac, NewMac};
+    use serde::Serialize;
+    use sha2::{Sha256, Sha512};
+
     use crate::algorithm::AlgorithmType;
     use crate::error::Error;
     use crate::header::Header;
     use crate::token::signed::{SignWithKey, SignWithStore};
     use crate::Token;
-    use hmac::{Hmac, NewMac};
-    use sha2::{Sha256, Sha512};
-    use std::collections::BTreeMap;
 
     #[derive(Serialize)]
     struct Claims<'a> {

src/token/verified.rs

@@ -144,12 +144,15 @@ pub(crate) fn split_components(token: &str) -> Result<[&str; 3], Error> {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::BTreeMap;
+
+    use hmac::{Hmac, NewMac};
+    use serde::Deserialize;
+    use sha2::{Sha256, Sha512};
+
     use crate::algorithm::VerifyingAlgorithm;
     use crate::error::Error;
     use crate::token::verified::{VerifyWithKey, VerifyWithStore};
-    use hmac::{Hmac, NewMac};
-    use sha2::{Sha256, Sha512};
-    use std::collections::BTreeMap;
 
     #[derive(Deserialize)]
     struct Claims {