mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #133 from erickt/fixup

Browse Source 
Fix doc links, recover some json deserialization speed
This commit is contained in:
Erick Tryzelaar 2015-08-09 18:17:02 -07:00
commit 5dc356ddb0
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -32,6 +32,6 @@ after_success: |
cp -r serde_macros/target/doc target/doc/serde_macros && cp -r serde_macros/target/doc target/doc/serde_macros &&
cp -r serde_json/target/doc target/doc/serde_json && 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 && 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 && ghp-import -n target/doc &&
git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages

4
serde/Cargo.toml
View File

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

2
serde_codegen/Cargo.toml
View File

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

4
serde_json/Cargo.toml
View File

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

8
serde_json/src/de.rs
View File

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

2
serde_macros/Cargo.toml
View File

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