From 0222b4af735394feecf19e5e7900a43b4dfbfc6e Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Mon, 16 Jun 2014 12:57:34 -0700 Subject: [PATCH] Track Rust master --- src/bin/cargo-verify-project.rs | 2 +- src/cargo/core/version_req.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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> 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) + } } )) -- 2.30.2