From 2ad8d887cda32214dc520af5a9621366f4522fdf Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Fri, 19 Jun 2015 11:41:29 +0200
Subject: [PATCH] fix(api): minor fixes

* Mime crate must be used in the same version hyper uses
* made attempted move a borrow
---
 src/mako/Cargo.toml.mako | 3 ++-
 src/rust/api/cmn.rs      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako
index f931121a69..c53c33b035 100644
--- a/src/mako/Cargo.toml.mako
+++ b/src/mako/Cargo.toml.mako
@@ -25,7 +25,8 @@ name = "${util.program_name()}"
 
 [dependencies]
 hyper = ">= 0.5.2"
-mime = "*"
+## Must match the one hyper uses, otherwise there are duplicate similarly named `Mime` structs
+mime = "0.0.11"
 serde = ">= 0.4.1"
 yup-oauth2 = "*"
 % for dep in cargo.get('dependencies', list()):
diff --git a/src/rust/api/cmn.rs b/src/rust/api/cmn.rs
index 027c701c03..1422e1f554 100644
--- a/src/rust/api/cmn.rs
+++ b/src/rust/api/cmn.rs
@@ -595,8 +595,8 @@ impl Header for RangeResponseHeader {
 
     fn parse_header(raw: &[Vec<u8>]) -> Option<Self> {
         if raw.len() > 0 {
-            let v = raw[0];
-            if let Ok(s) = std::str::from_utf8(&v) {
+            let v = &raw[0];
+            if let Ok(s) = std::str::from_utf8(v) {
                 const PREFIX: &'static str = "bytes ";
                 if s.starts_with(PREFIX) {
                     if let Ok(c) = <Chunk as FromStr>::from_str(&s[PREFIX.len()..]) {