diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-29 18:54:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 18:54:01 +0100 |
| commit | 7d43997053f940d3aa656a5054995a08edf5f3d4 (patch) | |
| tree | 68b172c44e427de40e84a099af257dffe49d9a68 /src/librustc_span | |
| parent | b22631bfafe0a6dbe038b180bf838847b39385ea (diff) | |
| parent | de7c40c1686c1c4be74f14493c4b12955e9ed5f2 (diff) | |
Rollup merge of #69572 - matthiaskrgr:try_err_and_iter_on_ref, r=Centril
use .iter() instead of .into_iter() on references
Diffstat (limited to 'src/librustc_span')
| -rw-r--r-- | src/librustc_span/source_map.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_span/source_map.rs b/src/librustc_span/source_map.rs index 31d397f040c..320039b7c91 100644 --- a/src/librustc_span/source_map.rs +++ b/src/librustc_span/source_map.rs @@ -395,7 +395,7 @@ impl SourceMap { .unwrap_or_else(|x| x); let special_chars = end_width_idx - start_width_idx; let non_narrow: usize = f.non_narrow_chars[start_width_idx..end_width_idx] - .into_iter() + .iter() .map(|x| x.width()) .sum(); col.0 - special_chars + non_narrow @@ -413,7 +413,7 @@ impl SourceMap { .binary_search_by_key(&pos, |x| x.pos()) .unwrap_or_else(|x| x); let non_narrow: usize = - f.non_narrow_chars[0..end_width_idx].into_iter().map(|x| x.width()).sum(); + f.non_narrow_chars[0..end_width_idx].iter().map(|x| x.width()).sum(); chpos.0 - end_width_idx + non_narrow }; Loc { file: f, line: 0, col: chpos, col_display } |