about summary refs log tree commit diff
path: root/src/libterm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-07-29 09:33:37 +0000
committerbors <bors@rust-lang.org>2018-07-29 09:33:37 +0000
commit023fd7e74a9eb5bafcb75fcbe69b7110e9de4492 (patch)
treec9b50228b27509d45f6d73e33aaec6b482c80c36 /src/libterm
parenta5c2d0fffaaf0b764c01bc4066e51ffd475ceae9 (diff)
parent57a5a9b05423c4f832cd9a3aaa7e06d55fab6efa (diff)
Auto merge of #52767 - ljedrz:avoid_format, r=petrochenkov
Prefer to_string() to format!()

Simple benchmarks suggest in some cases it can be faster by even 37%:
```
test converting_f64_long  ... bench:         339 ns/iter (+/- 199)
test converting_f64_short ... bench:         136 ns/iter (+/- 34)
test converting_i32_long  ... bench:          87 ns/iter (+/- 16)
test converting_i32_short ... bench:          87 ns/iter (+/- 49)
test converting_str       ... bench:          54 ns/iter (+/- 15)
test formatting_f64_long  ... bench:         349 ns/iter (+/- 176)
test formatting_f64_short ... bench:         145 ns/iter (+/- 14)
test formatting_i32_long  ... bench:          98 ns/iter (+/- 14)
test formatting_i32_short ... bench:          93 ns/iter (+/- 15)
test formatting_str       ... bench:          86 ns/iter (+/- 23)
```
Diffstat (limited to 'src/libterm')
-rw-r--r--src/libterm/terminfo/parser/compiled.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index d5e5df54733..57dcfb0d906 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -189,7 +189,7 @@ pub fn parse(file: &mut dyn io::Read, longnames: bool) -> Result<TermInfo, Strin
     macro_rules! t( ($e:expr) => (
         match $e {
             Ok(e) => e,
-            Err(e) => return Err(format!("{}", e))
+            Err(e) => return Err(e.to_string())
         }
     ) );