about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-08 12:00:22 +0000
committerbors <bors@rust-lang.org>2017-05-08 12:00:22 +0000
commit198917bb4f13daca7225af61d17c6fd4f70487bd (patch)
tree4d6b198ad0e356961a8b64603caa847a81b86b68 /src/libstd
parent70198a0a44633c7c9d14fce2159c1f750491287b (diff)
parentdd87eabd83296baa4c2214d2cf3aeef24f753ba7 (diff)
downloadrust-198917bb4f13daca7225af61d17c6fd4f70487bd.tar.gz
rust-198917bb4f13daca7225af61d17c6fd4f70487bd.zip
Auto merge of #41745 - oli-obk:diagnostics, r=jonathandturner
Remove need for &format!(...) or &&"" dances in `span_label` calls

These were always a thorn in my eye. Note that this will monomorphize to two impls, one for `String` and one for `&str`. But I think that cost is worth the ergonomics at the call sites that can be seen throughout this PR.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fs.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 6b1267d89b6..528d903b8b0 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -2412,7 +2412,7 @@ mod tests {
 
         let tmpdir = tmpdir();
         let unicode = tmpdir.path();
-        let unicode = unicode.join(&format!("test-각丁ー再见"));
+        let unicode = unicode.join("test-각丁ー再见");
         check!(fs::create_dir(&unicode));
         assert!(unicode.exists());
         assert!(!Path::new("test/unicode-bogus-path-각丁ー再见").exists());