Track Rust master

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);
 }

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)
+                    }
                 }
             ))