about summary refs log tree commit diff
path: root/src/libfuzzer
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-28 13:35:05 -0700
committerbors <bors@rust-lang.org>2013-05-28 13:35:05 -0700
commitd7e1f08b2115b3f5dd1497e993fb5b3029e70346 (patch)
tree90022709b561ed6d59b3a82a2f97bc4578bf5f5f /src/libfuzzer
parent833ed21f87e1994ec76a757f3cbf2b8deedf55e1 (diff)
parentb04c40bb1c96202409f663480076977619a1da30 (diff)
auto merge of #6774 : alexcrichton/rust/silence-warnings, r=graydon
Also as a bonus this fixes #6767
Diffstat (limited to 'src/libfuzzer')
-rw-r--r--src/libfuzzer/fuzzer.rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc
index 90a93a9e57c..0107517ff3f 100644
--- a/src/libfuzzer/fuzzer.rc
+++ b/src/libfuzzer/fuzzer.rc
@@ -139,7 +139,7 @@ pub fn stash_expr_if(c: @fn(@ast::expr, test_mode)->bool,
                      e: @ast::expr,
                      tm: test_mode) {
     if c(e, tm) {
-        *es = *es + ~[e];
+        *es = *es + [e];
     } else {
         /* now my indices are wrong :( */
     }
@@ -425,7 +425,7 @@ pub fn check_running(exe_filename: &Path) -> happiness {
     let p = run::process_output(
         "/Users/jruderman/scripts/timed_run_rust_program.py",
         [exe_filename.to_str()]);
-    let comb = str::from_bytes(p.output) + ~"\n" + str::from_bytes(p.error);
+    let comb = str::from_bytes(p.output) + "\n" + str::from_bytes(p.error);
     if str::len(comb) > 1u {
         error!("comb comb comb: %?", comb);
     }