arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-27 11:16:03 +00:00
Code Issues Projects Releases Wiki Activity

Make SpannedString iterators double ended & exact sized (#524)

Browse Source 
So that users can, for example, do .spans().len() to determine the number of
spans.
This commit is contained in:
Tejun Heo 2020-11-26 16:38:27 -05:00 committed by GitHub
parent b79ccf62da
commit 529aff0f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cursive-core/src/utils/span.rs
View File

@ -115,7 +115,11 @@ where
}
/// Gives access to the parsed styled spans.
pub fn spans<'b>(&'b self) -> impl Iterator<Item = Span<'a, T>> + 'b
pub fn spans<'b>(
&'b self,
) -> impl DoubleEndedIterator<Item = Span<'a, T>>
+ ExactSizeIterator<Item = Span<'a, T>>
+ 'b
where
'a: 'b,
{
@ -289,7 +293,10 @@ impl<T> SpannedString<T> {
}
/// Iterates on the resolved spans.
pub fn spans(&self) -> impl Iterator<Item = Span<'_, T>> {
pub fn spans(
&self,
) -> impl DoubleEndedIterator<Item = Span<'_, T>>
+ ExactSizeIterator<Item = Span<'_, T>> {
let source = &self.source;
self.spans.iter().map(move |span| span.resolve(source))
}
@ -312,7 +319,8 @@ impl<T> SpannedString<T> {
/// This can be used to modify the style of each span.
pub fn spans_raw_attr_mut(
&mut self,
) -> impl Iterator<Item = IndexedSpanRefMut<'_, T>> {
) -> impl DoubleEndedIterator<Item = IndexedSpanRefMut<'_, T>>
+ ExactSizeIterator<Item = IndexedSpanRefMut<'_, T>> {
self.spans.iter_mut().map(IndexedSpan::as_ref_mut)
}