about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-07-30 06:29:39 +0000
committerbors <bors@rust-lang.org>2018-07-30 06:29:39 +0000
commit7bbcd005b30582d07f1a39dcf50f77b54e055828 (patch)
treeee814e901b90440bc7b76ab13bdbb7468b3b17de /src/libtest
parenta3f519df09bf40d09c1a111599b8f115f11fbb49 (diff)
parent421b2ba347a3a1afa41b91f4254f238c790fd73b (diff)
downloadrust-7bbcd005b30582d07f1a39dcf50f77b54e055828.tar.gz
rust-7bbcd005b30582d07f1a39dcf50f77b54e055828.zip
Auto merge of #52805 - ljedrz:format_str_literal, r=petrochenkov
Don't format!() string literals

Prefer `to_string()` to `format!()` take 2, this time targetting string literals. In some cases (`&format!("...")` -> `"..."`) also removes allocations. Occurences of `format!("")` are changed to `String::new()`.
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index ed5b5565d89..3f8be97571f 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -557,7 +557,7 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> {
 
     let test_threads = match matches.opt_str("test-threads") {
         Some(n_str) => match n_str.parse::<usize>() {
-            Ok(0) => return Some(Err(format!("argument for --test-threads must not be 0"))),
+            Ok(0) => return Some(Err("argument for --test-threads must not be 0".to_string())),
             Ok(n) => Some(n),
             Err(e) => {
                 return Some(Err(format!(