Merge pull request #110 from RustCrypto/stream-cipher/2018-edition

stream-cipher: update to 2018 edition
RustCrypto · May 10, 2020 · dffe5b2 · dffe5b2
2 parents 6e80c03 + 14e2f61
commit dffe5b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/stream-cipher/Cargo.toml b/stream-cipher/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "stream-cipher"
+description = "Stream cipher traits"
 version = "0.3.2"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
-description = "Stream cipher traits"
+edition = "2018"
 documentation = "https://docs.rs/stream-cipher"
 repository = "https://github.com/RustCrypto/traits"
 keywords = ["crypto", "stream-cipher", "trait"]

diff --git a/stream-cipher/src/dev.rs b/stream-cipher/src/dev.rs
@@ -1,3 +1,5 @@
+//! Development-related functionality
+
 /// Test core functionality of synchronous stream cipher
 #[macro_export]
 macro_rules! new_sync_test {

diff --git a/stream-cipher/src/errors.rs b/stream-cipher/src/errors.rs
@@ -7,7 +7,7 @@ use std::error;
 pub struct LoopError;
 
 impl fmt::Display for LoopError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         f.write_str("Loop Error")
     }
 }
@@ -25,7 +25,7 @@ impl error::Error for LoopError {
 pub struct InvalidKeyNonceLength;
 
 impl fmt::Display for InvalidKeyNonceLength {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         f.write_str("Loop Error")
     }
 }

diff --git a/stream-cipher/src/lib.rs b/stream-cipher/src/lib.rs
@@ -3,23 +3,25 @@
 //!
 //! See [RustCrypto/stream-ciphers](https://github.com/RustCrypto/stream-ciphers)
 //! for ciphers implementation.
+
 #![no_std]
-#![forbid(unsafe_code)]
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
-#[cfg(feature = "dev")]
-pub extern crate blobby;
-pub extern crate generic_array;
+#![forbid(unsafe_code)]
+#![warn(missing_docs, rust_2018_idioms)]
+
 #[cfg(feature = "std")]
 extern crate std;
 
-use generic_array::typenum::Unsigned;
-use generic_array::{ArrayLength, GenericArray};
-
 #[cfg(feature = "dev")]
 pub mod dev;
+
 mod errors;
 
-pub use errors::{InvalidKeyNonceLength, LoopError};
+pub use crate::errors::{InvalidKeyNonceLength, LoopError};
+pub use generic_array;
+
+use generic_array::typenum::Unsigned;
+use generic_array::{ArrayLength, GenericArray};
 
 /// Stream cipher creation trait.
 ///