Update deps and base64 API, bump to 0.5.0.

InQuicker · Sep 10, 2016 · 04f90d9 · 04f90d9
1 parent 621144f
commit 04f90d9
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,11 +7,11 @@ license = "MIT"
 name = "ktmpl"
 readme = "README.md"
 repository = "https://github.com/InQuicker/ktmpl"
-version = "0.4.1"
+version = "0.5.0"
 
 [dependencies]
-base64 = "0.1.1"
-clap = "2.9.3"
+base64 = "0.2.1"
+clap = "2.11.3"
 lazy_static = "0.2.1"
-regex = "0.1.71"
-yaml-rust = "0.3.2"
+regex = "0.1.75"
+yaml-rust = "0.3.3"
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-TAG = 0.4.1
+TAG = 0.5.0
 
 all: dist
 

diff --git a/src/parameter.rs b/src/parameter.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::error::Error;
 use std::str::FromStr;
 
 use base64::encode;
@@ -62,10 +61,7 @@ impl Parameter {
         let value = match user_values.get(&name) {
             Some(user_value) => {
                 if should_base64_encode(&parameter_type, &user_value) {
-                    match encode(&user_value.value) {
-                        Ok(v) => Some(v),
-                        Err(error) => return Err(format!("{}", error.description())),
-                    }
+                    Some(encode(user_value.value.as_bytes()))
                 } else {
                     Some(user_value.value.clone())
                 }