Merge pull request #1 from lbeder/fix-travis-yml

Fix .travis.yml

.travis.yml

@@ -3,8 +3,8 @@ rust:
   - stable
   - nightly
 cache: cargo
-  before_script:
-    - rustup component add clippy
+before_script:
+  - rustup component add clippy
 script:
   - cargo clippy --all-targets --all-features -- -D warnings
   - cargo test --release

README.md

@@ -7,7 +7,8 @@ Scrypt Key Derivation Function in Rust
 ## Usage
 
 ```bash
-Usage: scrypt-kdf v0.3.3 [options]
+Usage: scrypt-kdf [options]
+Version: v0.3.4
 
 Options:
     -i, --iterations ITER

src/main.rs

@@ -25,7 +25,7 @@ use crate::scrypt_kdf::{ScryptKDF, ScryptKDFOptions};
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn print_usage(program: &str, opts: &Options) {
-    let brief = format!("Usage: {} v{} [options]", program, VERSION);
+    let brief = format!("Usage: {} [options]\nVersion: {}", program, VERSION);
     println!("{}", opts.usage(&brief));
 }
 

src/scrypt_kdf.rs

@@ -53,7 +53,7 @@ pub struct ScryptKDF<'a> {
 }
 
 impl<'a> ScryptKDF<'a> {
-    pub fn new(opts: &ScryptKDFOptions) -> ScryptKDF {
+    pub fn new(opts: &'a ScryptKDFOptions) -> Self {
         ScryptKDF { opts }
     }
 
@@ -71,7 +71,7 @@ impl<'a> ScryptKDF<'a> {
 
     pub fn derive_test_vectors() -> Vec<Vec<u8>> {
         let mut results: Vec<Vec<u8>> = vec![];
-        for test_vector in ScryptKDF::test_vectors() {
+        for test_vector in Self::test_vectors() {
             let kdf = Self::new(&test_vector.opts);
             results.push(kdf.derive_key("", &test_vector.secret));
         }