diff options
| author | bors <bors@rust-lang.org> | 2019-10-08 17:31:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-08 17:31:35 +0000 |
| commit | 2748a9fd93dd1a00a4521f4f16de5befbf77f6cd (patch) | |
| tree | d889f76e88e1ab000a0b64d9337868d8deeeccb3 /src/librustc_errors | |
| parent | 3fa9554d77960627cb2c983470bceacfeeb486b0 (diff) | |
| parent | 3246ab2427494abb59ecf3718f4dec83a0de406e (diff) | |
| download | rust-2748a9fd93dd1a00a4521f4f16de5befbf77f6cd.tar.gz rust-2748a9fd93dd1a00a4521f4f16de5befbf77f6cd.zip | |
Auto merge of #65209 - Centril:rollup-tzc0j87, r=Centril
Rollup of 8 pull requests Successful merges: - #64404 (Add long error explanation for E0495) - #64918 (Add long error explanation for E0551) - #65102 (Disable stack probe when thread sanitizer is enabled) - #65120 (Correctly estimate the required space for string in `StyledBuffer::prepend`) - #65145 (When suggesting assoc function with type params, include turbofish) - #65162 (Remove loaded_from_cache map from DepGraph) - #65176 (Remove query-related macros) - #65179 (Add long error explanation for E0567) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_errors')
| -rw-r--r-- | src/librustc_errors/styled_buffer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_errors/styled_buffer.rs b/src/librustc_errors/styled_buffer.rs index 6e03618d2b0..b12ab9e4576 100644 --- a/src/librustc_errors/styled_buffer.rs +++ b/src/librustc_errors/styled_buffer.rs @@ -111,7 +111,7 @@ impl StyledBuffer { pub fn prepend(&mut self, line: usize, string: &str, style: Style) { self.ensure_lines(line); - let string_len = string.len(); + let string_len = string.chars().count(); // Push the old content over to make room for new content for _ in 0..string_len { |