Merge pull request #133 from erickt/fixup

Fix doc links, recover some json deserialization speed

.travis.yml

@@ -32,6 +32,6 @@ after_success: |
   cp -r serde_macros/target/doc target/doc/serde_macros &&
   cp -r serde_json/target/doc target/doc/serde_json &&
   echo "<meta http-equiv=refresh content=0;url=`echo $TRAVIS_REPO_SLUG | cut -d '/' -f 2`/index.html>" > target/doc/index.html &&
-  sudo pip install ghp-import &&
+  pip install ghp-import &&
   ghp-import -n target/doc &&
   git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages

serde/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
 repository = "https://github.com/serde-rs/serde"
-documentation = "http://serde-rs.github.io/serde/serde"
+documentation = "https://serde-rs.github.io/serde/serde/serde/index.html"
 readme = "../README.md"
-keywords = ["serialization"]
+keywords = ["serde", "serialization"]
 
 [dependencies]
 num = "*"

serde_codegen/Cargo.toml

@@ -5,7 +5,9 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
 repository = "https://github.com/serde-rs/serde"
+documentation = "https://serde-rs.github.io/serde/serde_codegen/serde_codegen/index.html"
 build = "build.rs"
+keywords = ["serde", "serialization"]
 
 [features]
 default = ["with-syntex"]

serde_json/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A JSON serialization file format"
 repository = "https://github.com/serde-rs/serde"
-documentation = "http://serde-rs.github.io/serde/serde"
+documentation = "https://serde-rs.github.io/serde/serde_json/serde_json/index.html"
 readme = "../README.md"
-keywords = ["serialization", "json"]
+keywords = ["json", "serde", "serialization"]
 
 [dependencies]
 num = "*"

serde_json/src/de.rs

@@ -54,8 +54,14 @@ impl<Iter> Deserializer<Iter>
         match self.ch {
             Some(ch) => Ok(Some(ch)),
             None => {
-                self.ch = try!(self.next_char());
-                Ok(self.ch)
+                match self.rdr.next() {
+                    Some(Err(err)) => Err(Error::IoError(err)),
+                    Some(Ok(ch)) => {
+                        self.ch = Some(ch);
+                        Ok(self.ch)
+                    }
+                    None => Ok(None),
+                }
             }
         }
     }

serde_macros/Cargo.toml

@@ -5,6 +5,8 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
 repository = "https://github.com/serde-rs/serde"
+documentation = "https://github.com/serde-rs/serde"
+keywords = ["serde", "serialization"]
 
 [lib]
 name = "serde_macros"