From ff533237906c2925e2abb88cb00ce81f5120c2d8 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 9 Aug 2015 16:38:10 -0700 Subject: [PATCH 1/3] Correct the documentation links in the crates --- serde/Cargo.toml | 4 ++-- serde_codegen/Cargo.toml | 2 ++ serde_json/Cargo.toml | 4 ++-- serde_macros/Cargo.toml | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 0c6d7cbd..260c6898 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Erick Tryzelaar "] 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 = "*" diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 91d519e4..07920832 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -5,7 +5,9 @@ authors = ["Erick Tryzelaar "] 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"] diff --git a/serde_json/Cargo.toml b/serde_json/Cargo.toml index 5c1375c4..948041c3 100644 --- a/serde_json/Cargo.toml +++ b/serde_json/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Erick Tryzelaar "] 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 = "*" diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index ffb1ca48..2626d32a 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -5,6 +5,8 @@ authors = ["Erick Tryzelaar "] 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" From 26873bf3d518a64dd28e3070ce7e7097e2dc0beb Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 9 Aug 2015 16:40:35 -0700 Subject: [PATCH 2/3] Don't use sudo in the travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03e6c5cc..ba61ded8 100644 --- a/.travis.yml +++ b/.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 "" > 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 From dc36fd38d6152e30757d23f2c375ab4f986a57da Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 9 Aug 2015 16:45:55 -0700 Subject: [PATCH 3/3] Gain back 10MB/s on the json deserialization benchmark --- serde_json/src/de.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/serde_json/src/de.rs b/serde_json/src/de.rs index c66b5007..6940f94f 100644 --- a/serde_json/src/de.rs +++ b/serde_json/src/de.rs @@ -54,8 +54,14 @@ impl Deserializer 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), + } } } }