Compare commits

...

8 Commits

Author SHA1 Message Date
Erick Tryzelaar 9785646246 feat(cargo): Update syntex 2016-03-16 23:52:21 -07:00
Erick Tryzelaar b1cab411d6 Merge pull request #263 from dtolnay/docs/quotes
Missing quotes in upgrading-from-0.6 section of readme
2016-03-06 21:28:48 -05:00
David Tolnay b01fc032fd Missing quotes in upgrading-from-0.6 section of readme 2016-03-06 18:26:38 -08:00
Erick Tryzelaar f771eea6e6 doc(readme): Document new 0.7 skip-serializing approach 2016-03-06 21:20:04 -05:00
Erick Tryzelaar 6b127cb8d0 Update travis travis token 2016-03-06 21:14:23 -05:00
Erick Tryzelaar d0a63b451c Update README.md 2016-03-06 21:06:11 -05:00
Erick Tryzelaar 8296ff4bad Merge pull request #257 from frewsxcv/patch-1
Remove now default 'sudo: false'
2016-03-02 03:11:39 -08:00
Corey Farwell 4d4b85318f Remove now default 'sudo: false'
`sudo: false` is now default on Travis CI
2016-02-27 15:36:29 -05:00
7 changed files with 42 additions and 45 deletions
+18 -28
View File
@@ -1,43 +1,33 @@
language: rust
sudo: false
rust:
- stable
- beta
- nightly
- stable
- beta
- nightly
addons:
apt:
packages:
- libcurl4-openssl-dev
- libelf-dev
- libdw-dev
before_script:
- |
pip install 'travis-cargo<0.2' --user &&
export PATH=$HOME/.local/bin:$PATH
pip install 'travis-cargo<0.2' --user &&
export PATH=$HOME/.local/bin:$PATH
script:
- |
(cd serde && travis-cargo build) &&
(cd serde && travis-cargo test) &&
(cd serde && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_tests && travis-cargo test) &&
(cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_macros && travis-cargo --only nightly bench -- --features nightly-testing) &&
(cd serde && travis-cargo --only stable doc) &&
(cd serde_codegen && travis-cargo --only stable doc)
(cd serde && travis-cargo build) &&
(cd serde && travis-cargo test) &&
(cd serde && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_tests && travis-cargo test) &&
(cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) &&
(cd serde_macros && travis-cargo --only nightly bench -- --features nightly-testing) &&
(cd serde && travis-cargo --only stable doc) &&
(cd serde_codegen && travis-cargo --only stable doc)
after_success:
- (cd serde && travis-cargo --only stable doc-upload)
- (cd serde_tests && travis-cargo coveralls --no-sudo)
- "(cd serde && travis-cargo --only stable doc-upload)"
- "(cd serde_tests && travis-cargo coveralls --no-sudo)"
env:
global:
# override the default `--features unstable` used for the nightly branch (optional)
- TRAVIS_CARGO_NIGHTLY_FEATURE=""
# encrypted github token for doc upload (see `GH_TOKEN` link above)
- secure: HO41LMpMXkF2In9+1sxWVu7fgolL+y9+4Q5PI6wZX2L5pDwpPJCjxaQarQXCEnoIxED1PlP03JuF7ULNz0zw1ylYhAOfOSdkxFZRnE2wMZqq6qvXBHwyMiDrAociIzoPKSGv7JVrKPsjsnd+96K6xxueIodQZrmAdyq7N/M82Mc=
- TRAVIS_CARGO_NIGHTLY_FEATURE=""
- secure: Jcd11Jy0xLyacBUB+oKOaxKBm9iZNInenRDtNBY8GKOtqF5fHUfEjgDf538hwRl5L0FP7DLr8oK0IHmzA7lPjJxlzoKVKV3IM7bRZEYzW5DMonf/lcliuGte7SH0NVFhifM87T8HI2hjGdAb+7+m34siBR7M3AY/XjLInrvUFvY=
+7 -2
View File
@@ -13,8 +13,7 @@ the same speed as a hand written serializer for a specific type.
Documentation is available at:
* [serde](https://serde-rs.github.io/serde/serde/serde/serde/index.html)
* [serde\_codegen](https://serde-rs.github.io/serde/serde/serde_codegen/serde_codegen/index.html)
* [serde](https://serde-rs.github.io/serde/serde/index.html)
Using Serde with Nightly Rust and serde\_macros
===============================================
@@ -718,6 +717,12 @@ Field Annotations:
| `#[serde(serialize_with="$path")` | Call a function `fn<T, S>(&T, &mut S) -> Result<(), S::Error> where S: Serializer` to serialize this value |
| `#[serde(deserialize_with="$path")` | Call a function `fn<T, D>(&mut D) -> Result<T, D::Error> where D: Deserializer` to deserialize this value |
Upgrading from Serde 0.6
========================
* `#[serde(skip_serializing_if_none)]` was replaced with `#[serde(skip_serializing_if="Option::is_none")]`.
* `#[serde(skip_serializing_if_empty)]` was replaced with `#[serde(skip_serializing_if="Vec::is_empty")]`.
Serialization Formats Using Serde
=================================
+8 -8
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.7.0"
version = "0.7.1"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
@@ -16,13 +16,13 @@ nightly-testing = ["clippy"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies]
quasi_codegen = { version = "^0.7.0", optional = true }
syntex = { version = "^0.29.0", optional = true }
quasi_codegen = { version = "^0.8.0", optional = true }
syntex = { version = "^0.30.0", optional = true }
[dependencies]
aster = { version = "^0.13.1", default-features = false }
aster = { version = "^0.14.0", default-features = false }
clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.7.0", default-features = false }
quasi_macros = { version = "^0.7.0", optional = true }
syntex = { version = "^0.29.0", optional = true }
syntex_syntax = { version = "^0.29.0", optional = true }
quasi = { version = "^0.8.0", default-features = false }
quasi_macros = { version = "^0.8.0", optional = true }
syntex = { version = "^0.30.0", optional = true }
syntex_syntax = { version = "^0.30.0", optional = true }
+2 -2
View File
@@ -462,11 +462,11 @@ fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::
// error reporting, we'll first parse the string into a token tree. Then we'll update those
// spans to say they're coming from a macro context that originally came from the attribute,
// and then finally parse them into an expression.
let tts = parse::parse_tts_from_source_str(
let tts = panictry!(parse::parse_tts_from_source_str(
format!("<serde {} expansion>", name),
(*source).to_owned(),
cx.cfg(),
cx.parse_sess());
cx.parse_sess()));
// Respan the spans to say they are all coming from this macro.
let tts = Respanner { cx: cx }.fold_tts(&tts);
+2
View File
@@ -11,9 +11,11 @@ extern crate quasi;
extern crate syntex;
#[cfg(feature = "with-syntex")]
#[macro_use]
extern crate syntex_syntax as syntax;
#[cfg(not(feature = "with-syntex"))]
#[macro_use]
extern crate syntax;
#[cfg(not(feature = "with-syntex"))]
+1 -1
View File
@@ -20,7 +20,7 @@ clippy = { version = "^0.*", optional = true }
serde_codegen = { version = "^0.7.0", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies]
compiletest_rs = "^0.0.11"
compiletest_rs = "^0.1.1"
rustc-serialize = "^0.3.16"
serde = { version = "^0.7.0", path = "../serde" }
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_tests"
version = "0.6.3"
version = "0.7.1"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"
@@ -14,14 +14,14 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies]
syntex = { version = "^0.29.0" }
syntex_syntax = { version = "^0.29.0" }
syntex = { version = "^0.30.0" }
syntex_syntax = { version = "^0.30.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies]
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
syntex = "^0.29.0"
syntex = "^0.30.0"
[dependencies]
clippy = { version = "^0.*", optional = true }