From eb9c860cb477822b5f1a1e1fb5a3aac43735c819 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sun, 26 Apr 2015 09:02:34 -0700
Subject: [PATCH] Rename iterator.rs to iter.rs and expose it.

---
 src/{iterator.rs => iter.rs} | 6 +++---
 src/json/de.rs               | 3 ++-
 src/lib.rs                   | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename src/{iterator.rs => iter.rs} (94%)

diff --git a/src/iterator.rs b/src/iter.rs
similarity index 94%
rename from src/iterator.rs
rename to src/iter.rs
index f8d8099a9..508ebad1f 100644
--- a/src/iterator.rs
+++ b/src/iter.rs
@@ -1,7 +1,7 @@
 use std::io;
 
 pub struct LineColIterator<Iter: Iterator<Item=io::Result<u8>>> {
-    rdr: Iter,
+    iter: Iter,
     line: usize,
     col: usize,
 }
@@ -9,9 +9,9 @@ pub struct LineColIterator<Iter: Iterator<Item=io::Result<u8>>> {
 impl<Iter: Iterator<Item=io::Result<u8>>> LineColIterator<Iter> {
     pub fn new(iter: Iter) -> LineColIterator<Iter> {
         LineColIterator {
+            iter: iter,
             line: 1,
             col: 0,
-            rdr: iter,
         }
     }
 
@@ -34,7 +34,7 @@ impl<Iter: Iterator<Item=io::Result<u8>>> LineColIterator<Iter> {
 impl<Iter: Iterator<Item=io::Result<u8>>> Iterator for LineColIterator<Iter> {
     type Item = io::Result<u8>;
     fn next(&mut self) -> Option<io::Result<u8>> {
-        match self.rdr.next() {
+        match self.iter.next() {
             None => None,
             Some(Ok(b'\n')) => {
                 self.line += 1;
diff --git a/src/json/de.rs b/src/json/de.rs
index 2e978f2d7..6f55b6b84 100644
--- a/src/json/de.rs
+++ b/src/json/de.rs
@@ -3,8 +3,9 @@ use std::io;
 use std::str;
 
 use de;
+use iter::LineColIterator;
+
 use super::error::{Error, ErrorCode};
-use iterator::LineColIterator;
 
 pub struct Deserializer<Iter: Iterator<Item=io::Result<u8>>> {
     rdr: LineColIterator<Iter>,
diff --git a/src/lib.rs b/src/lib.rs
index cac66ca40..9c31fc553 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,8 +12,8 @@ extern crate num;
 pub use ser::{Serialize, Serializer};
 pub use de::{Deserialize, Deserializer, Error};
 
-pub mod ser;
+pub mod bytes;
 pub mod de;
+pub mod iter;
 pub mod json;
-pub mod bytes;
-mod iterator;
+pub mod ser;