diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs index e06937693..7e5424bef 100644 --- a/helix-core/src/graphemes.rs +++ b/helix-core/src/graphemes.rs @@ -160,7 +160,7 @@ pub struct RopeGraphemes<'a> { } impl<'a> RopeGraphemes<'a> { - pub fn new<'b>(slice: RopeSlice<'b>) -> RopeGraphemes<'b> { + pub fn new(slice: RopeSlice) -> RopeGraphemes { let mut chunks = slice.chunks(); let first_chunk = chunks.next().unwrap_or(""); RopeGraphemes { diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs index 977129efe..14e58293f 100644 --- a/helix-core/src/lib.rs +++ b/helix-core/src/lib.rs @@ -13,15 +13,12 @@ pub mod syntax; mod transaction; pub(crate) fn find_first_non_whitespace_char2(line: RopeSlice) -> Option { - let mut start = 0; - // find first non-whitespace char - for ch in line.chars() { + for (start, ch) in line.chars().enumerate() { // TODO: could use memchr with chunks? if ch != ' ' && ch != '\t' && ch != '\n' { return Some(start); } - start += 1; } None