From 66c0b8dd0c76ac7cf81451e0b6fe1cb6a5f52119 Mon Sep 17 00:00:00 2001
From: Luro02 <24826124+Luro02@users.noreply.github.com>
Date: Thu, 6 Feb 2020 17:02:44 +0100
Subject: [PATCH] improve Iterator types

---
 src/attribute.rs |  2 +-
 src/line.rs      | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/attribute.rs b/src/attribute.rs
index 50a6d17..f60b60c 100644
--- a/src/attribute.rs
+++ b/src/attribute.rs
@@ -1,6 +1,6 @@
 use core::iter::FusedIterator;
 
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug)]
 pub(crate) struct AttributePairs<'a> {
     string: &'a str,
     index: usize,
diff --git a/src/line.rs b/src/line.rs
index 90cb3b4..299f5be 100644
--- a/src/line.rs
+++ b/src/line.rs
@@ -5,11 +5,9 @@ use std::str::FromStr;
 use crate::tags;
 use crate::Error;
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq, Hash)]
+#[derive(Debug, Clone)]
 pub(crate) struct Lines<'a> {
-    buffer: &'a str,
-    // the line at which the iterator currently is
-    position: usize,
+    lines: ::core::str::Lines<'a>,
 }
 
 impl<'a> Iterator for Lines<'a> {
@@ -19,9 +17,8 @@ impl<'a> Iterator for Lines<'a> {
         let mut stream_inf = false;
         let mut stream_inf_line = None;
 
-        for line in self.buffer.lines().skip(self.position) {
+        while let Some(line) = self.lines.next() {
             let line = line.trim();
-            self.position += 1;
 
             if line.is_empty() {
                 continue;
@@ -62,8 +59,7 @@ impl<'a> Iterator for Lines<'a> {
 impl<'a> From<&'a str> for Lines<'a> {
     fn from(buffer: &'a str) -> Self {
         Self {
-            buffer,
-            position: 0,
+            lines: buffer.lines(),
         }
     }
 }