From: Carl Lerche <me@carllerche.com>
Date: Mon, 16 Jun 2014 19:57:34 +0000 (-0700)
Subject: Track Rust master
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1011
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0222b4af735394feecf19e5e7900a43b4dfbfc6e;p=cargo.git

Track Rust master
---

diff --git a/src/bin/cargo-verify-project.rs b/src/bin/cargo-verify-project.rs
index 974cfaed5..13f860b29 100644
--- a/src/bin/cargo-verify-project.rs
+++ b/src/bin/cargo-verify-project.rs
@@ -50,6 +50,6 @@ fn main() {
 }
 
 fn fail(reason: &str, value: &str) {
-    println!(r#"\{ "{:s}", "{:s}" \}"#, reason, value);
+    println!(r#"{{ "{:s}", "{:s}" }}"#, reason, value);
     set_exit_status(1);
 }
diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs
index 656196d43..1b4d7bcf7 100644
--- a/src/cargo/core/version_req.rs
+++ b/src/cargo/core/version_req.rs
@@ -286,7 +286,10 @@ impl<'a> Iterator<Token<'a>> for Lexer<'a> {
                         c = n_char;
                         idx = n_idx;
                     }
-                    _ => return self.flush(idx + 1, self.state)
+                    _ => {
+                      let s = self.state;
+                      return self.flush(idx + 1, s)
+                    }
                 }
             ))