Track Rust master

diff --git a/src/bin/cargo-verify-project.rs b/src/bin/cargo-verify-project.rs
index 974cfaed5f7e8a5e0afdee39b7756e8f12da7aeb..13f860b29805b17a5501f424c7cc2b61dbfdb26d 100644 (file)
--- 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 656196d4316f7eb71f4a70209dc4602f110393e3..1b4d7bcf77769bd90423647f778b935e6fc19a30 100644 (file)
--- 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)
+                    }
                 }
             ))