diff options
| author | sinkuu <sinkuupump@gmail.com> | 2017-02-25 22:05:30 +0900 |
|---|---|---|
| committer | sinkuu <sinkuupump@gmail.com> | 2017-02-25 22:11:54 +0900 |
| commit | 8a64cf7fb72ca93608be19e13dd83c23168b17d7 (patch) | |
| tree | 4bcc4af29089f1d1b0aa19989867094dfab7da51 /src/librustc_errors | |
| parent | 08230775a026c955873ba557e624b7f665661f37 (diff) | |
| download | rust-8a64cf7fb72ca93608be19e13dd83c23168b17d7.tar.gz rust-8a64cf7fb72ca93608be19e13dd83c23168b17d7.zip | |
Fix suggestion span error with a line containing non-ASCIIs
Diffstat (limited to 'src/librustc_errors')
| -rw-r--r-- | src/librustc_errors/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index d7bd5ed23c2..4c889dad8ca 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -90,7 +90,8 @@ impl CodeSuggestion { hi_opt: Option<&Loc>) { let (lo, hi_opt) = (lo.col.to_usize(), hi_opt.map(|hi| hi.col.to_usize())); if let Some(line) = line_opt { - if line.len() > lo { + if let Some(lo) = line.char_indices().map(|(i, _)| i).nth(lo) { + let hi_opt = hi_opt.and_then(|hi| line.char_indices().map(|(i, _)| i).nth(hi)); buf.push_str(match hi_opt { Some(hi) => &line[lo..hi], None => &line[lo..], |