From 6d091c29cd160ffddf870929bfb3e601fa01031a Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 31 Mar 2020 19:56:02 +0100
Subject: Upgrade annotate-snippets version
---
dhall/src/syntax/ast/span.rs | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
(limited to 'dhall/src/syntax')
diff --git a/dhall/src/syntax/ast/span.rs b/dhall/src/syntax/ast/span.rs
index 153a624..79bcc52 100644
--- a/dhall/src/syntax/ast/span.rs
+++ b/dhall/src/syntax/ast/span.rs
@@ -76,18 +76,12 @@ impl Span {
/// Convert a byte idx into a string into a char idx for consumption by annotate_snippets.
fn char_idx_from_byte_idx(input: &str, idx: usize) -> usize {
- let char_idx = input
+ input
.char_indices()
.enumerate()
.find(|(_, (i, _))| *i == idx)
.map(|(i, (_, _))| i)
// We should be able to unwrap() here, but somehow it panics on an example from
// serde_dhall/lib.rs...
- .unwrap_or(0);
- // Unix-style newlines are counted as two chars (see
- // https://github.com/rust-lang/annotate-snippets-rs/issues/24).
- let nbr_newlines = input[..idx].chars().filter(|c| *c == '\n').count();
- let nbr_carriage_returns =
- input[..idx].chars().filter(|c| *c == '\r').count();
- char_idx + nbr_newlines - nbr_carriage_returns
+ .unwrap_or(0)
}
--
cgit v1.2.3