From f237e9e2e74dfd5b223589f6254c80e8a69b724e Mon Sep 17 00:00:00 2001
From: Mark Simulacrum <mark.simulacrum@gmail.com>
Date: Mon, 12 Feb 2018 12:28:32 -0700
Subject: [PATCH] Remove allocation from width of character function.
---
src/libsyntax/codemap.rs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index 3601b9ba8a8c1..ff6f32fc3be0b 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -690,14 +690,16 @@ impl CodeMap {
return 1;
}
+ let src = local_begin.fm.external_src.borrow();
+
// We need to extend the snippet to the end of the src rather than to end_index so when
// searching forwards for boundaries we've got somewhere to search.
let snippet = if let Some(ref src) = local_begin.fm.src {
let len = src.len();
- (&src[start_index..len]).to_string()
- } else if let Some(src) = local_begin.fm.external_src.borrow().get_source() {
+ (&src[start_index..len])
+ } else if let Some(src) = src.get_source() {
let len = src.len();
- (&src[start_index..len]).to_string()
+ (&src[start_index..len])
} else {
return 1;
};