Don't format!() string literals #52805

ljedrz · 2018-07-28T12:42:29Z

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().

rust-highfive · 2018-07-28T12:42:32Z

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm · 2018-07-28T15:10:34Z

src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs

@@ -99,30 +99,26 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
        let span_label_var1 = if let Some(simple_ident) = anon_arg_sup.pat.simple_ident() {
            format!(" from `{}`", simple_ident)
        } else {
-            format!("")
+            "".to_string()


Using String::new() instead of "".to_string() would be even faster. (Similar for every other occurrences)

kennytm · 2018-07-28T15:15:55Z

src/librustc_incremental/assert_dep_graph.rs

@@ -229,7 +229,7 @@ fn check_paths<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
 }

 fn dump_graph(tcx: TyCtxt) {
-    let path: String = env::var("RUST_DEP_GRAPH").unwrap_or_else(|_| format!("dep_graph"));
+    let path: String = env::var("RUST_DEP_GRAPH").unwrap_or("dep_graph".to_string());


We should keep the unwrap_or_else where. .to_string() is not free.

ljedrz · 2018-07-28T16:05:33Z

@kennytm thanks, done.

petrochenkov · 2018-07-29T00:32:45Z

@bors r+

bors · 2018-07-29T00:32:46Z

📌 Commit 421b2ba has been approved by petrochenkov

bors · 2018-07-29T16:34:20Z

⌛ Testing commit 421b2ba with merge 7ff3098...

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()`.

bors · 2018-07-29T19:37:24Z

💔 Test failed - status-appveyor

ljedrz · 2018-07-29T20:07:24Z

Build execution time has reached the maximum allowed time for your plan (180 minutes).

Spurious?

kennytm · 2018-07-30T00:00:39Z

@bors retry

bors · 2018-07-30T00:34:28Z

⌛ Testing commit 421b2ba with merge 6a3fada2b42a3fba3e4d872d555d743ab711b999...

bors · 2018-07-30T01:08:08Z

💔 Test failed - status-travis

rust-highfive · 2018-07-30T01:08:10Z

The job dist-mipsel-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

######################################################################    97.8%
######################################################################## 100.0%
[00:00:59] extracting /checkout/obj/build/cache/2018-07-27/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz
[00:00:59] downloading https://static.rust-lang.org/dist/2018-07-27/rustc-beta-x86_64-unknown-linux-gnu.tar.gz
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2018-07-30T01:45:14Z

@bors retry

bors · 2018-07-30T03:30:28Z

⌛ Testing commit 421b2ba with merge 988b7451140651f904f5d8147a0d4accb2f7e6c2...

bors · 2018-07-30T04:34:16Z

💔 Test failed - status-travis

rust-highfive · 2018-07-30T04:34:18Z

The job dist-x86_64-musl of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:00:56] test [run-pass] run-pass/trivial-message.rs ... ok
[01:00:56] test [run-pass] run-pass/try-operator-hygiene.rs ... ok
[01:00:57] test [run-pass] run-pass/try-macro.rs ... ok

Broadcast message from root@travis-job-feee2b13-5b2a-4a1d-ad05-039941501fc5
 (unknown) at 4:33 ...
The system is going down for power off NOW!
[01:00:57] 
[01:00:57] Session terminated, terminating shell... ...terminated.

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 143.
travis_time:start:2abf60c1
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2018-07-30T04:59:52Z

@bors retry travis-ci/travis-ci#4924

bors · 2018-07-30T06:29:45Z

⌛ Testing commit 421b2ba with merge 7bbcd00...

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()`.

bors · 2018-07-30T08:25:30Z

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 7bbcd00 to master...

rust-highfive assigned petrochenkov Jul 28, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2018

kennytm reviewed Jul 28, 2018

View reviewed changes

Don't format!() string literals

421b2ba

ljedrz force-pushed the format_str_literal branch from 01bed0e to 421b2ba Compare July 28, 2018 16:03

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 29, 2018

phansch mentioned this pull request Jul 29, 2018

Performance: Suggest String::new() over "".to_string() rust-lang/rust-clippy#2972

Closed

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 29, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 30, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 30, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2018

bors merged commit 421b2ba into rust-lang:master Jul 30, 2018

ljedrz deleted the format_str_literal branch July 30, 2018 14:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't format!() string literals #52805

Don't format!() string literals #52805

ljedrz commented Jul 28, 2018 •

edited

Loading

rust-highfive commented Jul 28, 2018

kennytm Jul 28, 2018

kennytm Jul 28, 2018

ljedrz commented Jul 28, 2018

petrochenkov commented Jul 29, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018

ljedrz commented Jul 29, 2018 •

edited

Loading

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

rust-highfive commented Jul 30, 2018

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

rust-highfive commented Jul 30, 2018

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

Don't format!() string literals #52805

Don't format!() string literals #52805

Conversation

ljedrz commented Jul 28, 2018 • edited Loading

rust-highfive commented Jul 28, 2018

kennytm Jul 28, 2018

Choose a reason for hiding this comment

kennytm Jul 28, 2018

Choose a reason for hiding this comment

ljedrz commented Jul 28, 2018

petrochenkov commented Jul 29, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018

ljedrz commented Jul 29, 2018 • edited Loading

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

rust-highfive commented Jul 30, 2018

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

rust-highfive commented Jul 30, 2018

kennytm commented Jul 30, 2018

bors commented Jul 30, 2018

bors commented Jul 30, 2018

ljedrz commented Jul 28, 2018 •

edited

Loading

ljedrz commented Jul 29, 2018 •

edited

Loading