diff options
| author | bors <bors@rust-lang.org> | 2021-01-18 14:36:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-18 14:36:30 +0000 |
| commit | 5e91c4ecc09312d8b63d250a432b0f3ef83f1df7 (patch) | |
| tree | 994a9e3c43f68368785e414945aa8949e2493c25 /compiler/rustc_parse_format/src | |
| parent | 66eb9821666e0672a69a998d2331733c7a8996a5 (diff) | |
| parent | 33d184bfd093460d56a10c8a151b66147d2b4041 (diff) | |
| download | rust-5e91c4ecc09312d8b63d250a432b0f3ef83f1df7.tar.gz rust-5e91c4ecc09312d8b63d250a432b0f3ef83f1df7.zip | |
Auto merge of #81165 - KodrAus:rollup-s7llxis, r=KodrAus
Rollup of 12 pull requests Successful merges: - #81038 (Update Clippy) - #81071 (rustc_parse_format: Fix character indices in find_skips) - #81100 (prevent potential bug in `encode_with_shorthand`.) - #81105 (Initialize a few variables directly) - #81116 (ConstProp: Copy body span instead of querying it) - #81121 (Avoid logging the whole MIR body in SimplifyCfg) - #81123 (Update cmp.rs) - #81125 (Add track_caller to .steal()) - #81128 (validation test: turn some const_err back into validation failures) - #81131 (Edit rustc_middle::ty::cast docs) - #81142 (Replace let Some(..) = with .is_some()) - #81153 (Remove unused linkcheck exceptions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse_format/src')
| -rw-r--r-- | compiler/rustc_parse_format/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse_format/src/lib.rs b/compiler/rustc_parse_format/src/lib.rs index f7b16bd991b..f150f7a41ae 100644 --- a/compiler/rustc_parse_format/src/lib.rs +++ b/compiler/rustc_parse_format/src/lib.rs @@ -736,7 +736,7 @@ fn find_skips_from_snippet( fn find_skips(snippet: &str, is_raw: bool) -> Vec<usize> { let mut eat_ws = false; - let mut s = snippet.chars().enumerate().peekable(); + let mut s = snippet.char_indices().peekable(); let mut skips = vec![]; while let Some((pos, c)) = s.next() { match (c, s.peek()) { |