@@ -96,11 +96,11 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
96 match (self.next_event, &self.next_span) {
96 match (self.next_event, &self.next_span) {
97 (Some(HighlightStart(i)), _) => {
97 (Some(HighlightStart(i)), _) => {
98 self.next_event = self.iter.next();
98 self.next_event = self.iter.next();
99− return Some(HighlightStart(i));
99+ Some(HighlightStart(i))
101 (Some(HighlightEnd), _) => {
101 (Some(HighlightEnd), _) => {
102 self.next_event = self.iter.next();
102 self.next_event = self.iter.next();
103− return Some(HighlightEnd);
103+ Some(HighlightEnd)
105 (Some(Source { start, end }), Some((span, range))) if start < range.start => {
105 (Some(Source { start, end }), Some((span, range))) if start < range.start => {
106 let intersect = range.start.min(end);
106 let intersect = range.start.min(end);
@@ -154,9 +154,9 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
155 (Some(event), None) => {
155 (Some(event), None) => {
156 self.next_event = self.iter.next();
156 self.next_event = self.iter.next();
157− return Some(event);
157+ Some(event)
159− (None, None) => return None,
159+ (None, None) => None,
160 e => unreachable!("{:?}", e),
160 e => unreachable!("{:?}", e),