diff --git a/.travis.yml b/.travis.yml index 7e3e0d3b..19a2d692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,15 +18,15 @@ before_script: script: - (cd serde && travis-cargo build) - (cd serde && travis-cargo --skip nightly test) -- (cd serde && travis-cargo --only nightly test -- --features nightly-testing) +- (cd serde && travis-cargo --only nightly test -- --features unstable-testing) - (cd serde && travis-cargo build -- --no-default-features) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections) - (cd testing && travis-cargo --skip nightly test) -- (cd testing && travis-cargo --only nightly test -- --features nightly-testing) -- (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) +- (cd testing && travis-cargo --only nightly test -- --features unstable-testing) +- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing) #- (cd examples/serde-syntex-example && travis-cargo --skip nightly run) -#- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features nightly) +#- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable) - (cd serde && travis-cargo --only stable doc) after_success: - (cd serde && travis-cargo --only stable doc-upload) diff --git a/examples/serde-syntex-example/Cargo.toml b/examples/serde-syntex-example/Cargo.toml index 7e87e833..73b813b2 100644 --- a/examples/serde-syntex-example/Cargo.toml +++ b/examples/serde-syntex-example/Cargo.toml @@ -6,7 +6,7 @@ build = "build.rs" [features] default = ["serde_codegen"] -nightly = ["serde_macros"] +unstable = ["serde_macros"] [build-dependencies] serde_codegen = { version = "^0.7", optional = true } diff --git a/serde/Cargo.toml b/serde/Cargo.toml index e8e8d858..fbb53b19 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -2,7 +2,7 @@ name = "serde" # DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH # USE THE 0.7.x BRANCH -version = "0.8.0-rc1" +version = "0.8.0-rc2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" @@ -16,10 +16,10 @@ include = ["Cargo.toml", "src/**/*.rs"] default = ["std"] std = [] -nightly = [] -alloc = ["nightly"] +unstable = [] +alloc = ["unstable"] collections = ["alloc"] -nightly-testing = ["clippy", "nightly", "std"] +unstable-testing = ["clippy", "unstable", "std"] [dependencies] clippy = { version = "^0.*", optional = true } diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index d4591690..4096fa8f 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -2,7 +2,7 @@ #[cfg(feature = "std")] use std::borrow::Cow; -#[cfg(all(feature = "nightly", feature = "collections", not(feature = "std")))] +#[cfg(all(feature = "unstable", feature = "collections", not(feature = "std")))] use collections::borrow::Cow; #[cfg(all(feature = "collections", not(feature = "std")))] @@ -27,9 +27,9 @@ use std::collections::{ VecDeque, }; -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] use collections::enum_set::{CLike, EnumSet}; -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] use collections::borrow::ToOwned; use core::hash::{Hash, BuildHasher}; @@ -42,21 +42,21 @@ use core::str; #[cfg(feature = "std")] use std::rc::Rc; -#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))] +#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))] use alloc::rc::Rc; #[cfg(feature = "std")] use std::sync::Arc; -#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))] +#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))] use alloc::arc::Arc; -#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))] +#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))] use alloc::boxed::Box; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::nonzero::{NonZero, Zeroable}; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::num::Zero; use de::{ @@ -461,7 +461,7 @@ seq_impl!( BTreeSet::new(), BTreeSet::insert); -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] seq_impl!( EnumSet, EnumSetVisitor, @@ -806,7 +806,7 @@ map_impl!( /////////////////////////////////////////////////////////////////////////////// -#[cfg(all(feature = "nightly", feature = "std"))] +#[cfg(all(feature = "unstable", feature = "std"))] impl Deserialize for net::IpAddr { fn deserialize(deserializer: &mut D) -> Result where D: Deserializer, @@ -972,7 +972,7 @@ impl<'a, T: ?Sized> Deserialize for Cow<'a, T> where T: ToOwned, T::Owned: Deser /////////////////////////////////////////////////////////////////////////////// -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] impl Deserialize for NonZero where T: Deserialize + PartialEq + Zeroable + Zero { fn deserialize(deserializer: &mut D) -> Result, D::Error> where D: Deserializer { let value = try!(Deserialize::deserialize(deserializer)); diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index b2349a17..65499ee3 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -25,7 +25,7 @@ use collections::{ vec, }; -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] use collections::borrow::ToOwned; use core::hash::Hash; diff --git a/serde/src/error.rs b/serde/src/error.rs index 9852e1f2..7e5fef72 100644 --- a/serde/src/error.rs +++ b/serde/src/error.rs @@ -4,7 +4,7 @@ use core::fmt::{Debug, Display}; /// A stand-in for `std::error::Error`, which requires no allocation. -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] pub trait Error: Debug + Display + ::core::marker::Reflect { /// A short description of the error. /// @@ -24,7 +24,7 @@ pub trait Error: Debug + Display + ::core::marker::Reflect { } /// A stand-in for `std::error::Error`, which requires no allocation. -#[cfg(not(feature = "nightly"))] +#[cfg(not(feature = "unstable"))] pub trait Error: Debug + Display { /// A short description of the error. /// diff --git a/serde/src/lib.rs b/serde/src/lib.rs index e98741c6..808d50cf 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -11,29 +11,29 @@ #![doc(html_root_url="https://serde-rs.github.io/serde/serde")] #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(feature = "nightly", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))] +#![cfg_attr(feature = "unstable", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))] #![cfg_attr(feature = "alloc", feature(alloc))] #![cfg_attr(feature = "collections", feature(collections, enumset))] -#![cfg_attr(feature = "nightly-testing", plugin(clippy))] -#![cfg_attr(feature = "nightly-testing", allow(linkedlist))] +#![cfg_attr(feature = "clippy", plugin(clippy))] +#![cfg_attr(feature = "clippy", allow(linkedlist))] -#![cfg_attr(any(not(feature = "std"), feature = "nightly"), allow(unused_variables, unused_imports, unused_features, dead_code))] +#![cfg_attr(any(not(feature = "std"), feature = "unstable"), allow(unused_variables, unused_imports, unused_features, dead_code))] #![deny(missing_docs)] -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] extern crate collections; -#[cfg(all(feature = "nightly", feature = "alloc"))] +#[cfg(all(feature = "unstable", feature = "alloc"))] extern crate alloc; #[cfg(feature = "std")] mod core { pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize, usize, f32, f64, char, str, num, slice, iter}; - #[cfg(feature = "nightly")] + #[cfg(feature = "unstable")] extern crate core; - #[cfg(feature = "nightly")] + #[cfg(feature = "unstable")] pub use self::core::nonzero; } diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index a8876c95..89078df5 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -26,19 +26,19 @@ use collections::{ Vec, }; -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] use collections::enum_set::{CLike, EnumSet}; -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] use collections::borrow::ToOwned; use core::hash::{Hash, BuildHasher}; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::iter; #[cfg(feature = "std")] use std::net; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::num; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::ops; #[cfg(feature = "std")] use std::path; @@ -57,7 +57,7 @@ use alloc::boxed::Box; use core::marker::PhantomData; -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] use core::nonzero::{NonZero, Zeroable}; use super::{ @@ -244,7 +244,7 @@ impl Serialize for BTreeSet serialize_seq!(); } -#[cfg(all(feature = "nightly", feature = "collections"))] +#[cfg(all(feature = "unstable", feature = "collections"))] impl Serialize for EnumSet where T: Serialize + CLike { @@ -276,7 +276,7 @@ impl Serialize for VecDeque where T: Serialize { serialize_seq!(); } -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] impl Serialize for ops::Range where A: Serialize + Clone + iter::Step + num::One, for<'a> &'a A: ops::Add<&'a A, Output = A>, @@ -619,7 +619,7 @@ impl Serialize for Result where T: Serialize, E: Serialize { /////////////////////////////////////////////////////////////////////////////// -#[cfg(all(feature = "std", feature = "nightly"))] +#[cfg(all(feature = "std", feature = "unstable"))] impl Serialize for net::IpAddr { fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer, @@ -704,7 +704,7 @@ impl Serialize for path::PathBuf { } } -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] impl Serialize for NonZero where T: Serialize + Zeroable { fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer { (**self).serialize(serializer) diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 5e2d3a85..d13a3610 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -2,7 +2,7 @@ name = "serde_codegen" # DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH # USE THE 0.7.x BRANCH -version = "0.8.0-rc1" +version = "0.8.0-rc2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -14,8 +14,8 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"] [features] default = ["with-syntex"] -nightly = ["quasi_macros"] -nightly-testing = ["clippy"] +unstable = ["quasi_macros"] +unstable-testing = ["clippy"] with-syntex = [ "quasi/with-syntex", "quasi_codegen", @@ -34,6 +34,6 @@ aster = { version = "^0.21.1", default-features = false } clippy = { version = "^0.*", optional = true } quasi = { version = "^0.15.0", default-features = false } quasi_macros = { version = "^0.15.0", optional = true } -serde_codegen_internals = { version = "^0.3.0", default-features = false } +serde_codegen_internals = { version = "0.4.0-rc1", default-features = false } syntex = { version = "^0.38.0", optional = true } syntex_syntax = { version = "^0.38.0", optional = true } diff --git a/serde_codegen/src/lib.rs b/serde_codegen/src/lib.rs index 25801570..5cc90efa 100644 --- a/serde_codegen/src/lib.rs +++ b/serde_codegen/src/lib.rs @@ -1,7 +1,7 @@ -#![cfg_attr(feature = "nightly-testing", plugin(clippy))] -#![cfg_attr(feature = "nightly-testing", feature(plugin))] -#![cfg_attr(feature = "nightly-testing", allow(too_many_arguments))] -#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))] +#![cfg_attr(feature = "clippy", plugin(clippy))] +#![cfg_attr(feature = "clippy", feature(plugin))] +#![cfg_attr(feature = "clippy", allow(too_many_arguments))] +#![cfg_attr(feature = "clippy", allow(used_underscore_binding))] #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] #![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))] diff --git a/serde_codegen_internals/Cargo.toml b/serde_codegen_internals/Cargo.toml index a6b13523..9a19e65e 100644 --- a/serde_codegen_internals/Cargo.toml +++ b/serde_codegen_internals/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen_internals" -version = "0.3.0" +version = "0.4.0-rc1" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "AST representation used by Serde codegen. Unstable." @@ -11,7 +11,7 @@ include = ["Cargo.toml", "src/**/*.rs"] [features] default = ["with-syntex"] -nightly-testing = ["clippy"] +unstable-testing = ["clippy"] with-syntex = ["syntex_syntax", "syntex_errors"] [dependencies] diff --git a/serde_codegen_internals/src/lib.rs b/serde_codegen_internals/src/lib.rs index 4d347f16..89f20aa6 100644 --- a/serde_codegen_internals/src/lib.rs +++ b/serde_codegen_internals/src/lib.rs @@ -1,5 +1,5 @@ -#![cfg_attr(feature = "nightly-testing", plugin(clippy))] -#![cfg_attr(feature = "nightly-testing", feature(plugin))] +#![cfg_attr(feature = "clippy", plugin(clippy))] +#![cfg_attr(feature = "clippy", feature(plugin))] #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] #[cfg(feature = "with-syntex")] diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 9ed8b6cf..5381d499 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -2,7 +2,7 @@ name = "serde_macros" # DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH # USE THE 0.7.x BRANCH -version = "0.8.0-rc1" +version = "0.8.0-rc2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -16,19 +16,19 @@ name = "serde_macros" plugin = true [features] -nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] +unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"] [dependencies] clippy = { version = "^0.*", optional = true } -serde_codegen = { version = "^0.8.0-rc1", default-features = false, features = ["nightly"] } +serde_codegen = { version = "^0.8.0-rc2", default-features = false, features = ["unstable"] } [dev-dependencies] clippy = "^0.*" compiletest_rs = "^0.2.0" fnv = "1.0" rustc-serialize = "^0.3.16" -serde = "0.8.0-rc1" -serde_test = "0.8.0-rc1" +serde = "0.8.0-rc2" +serde_test = "0.8.0-rc2" [[test]] name = "test" diff --git a/serde_test/Cargo.toml b/serde_test/Cargo.toml index 38d16702..9855d12f 100644 --- a/serde_test/Cargo.toml +++ b/serde_test/Cargo.toml @@ -2,7 +2,7 @@ name = "serde_test" # DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH # USE THE 0.7.x BRANCH -version = "0.8.0-rc1" +version = "0.8.0-rc2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Token De/Serializer for testing De/Serialize implementations" @@ -13,4 +13,4 @@ keywords = ["serde", "serialization"] include = ["Cargo.toml", "src/**/*.rs"] [dependencies] -serde = "0.8.0-rc1" +serde = "0.8.0-rc2" diff --git a/testing/Cargo.toml b/testing/Cargo.toml index efae4b41..fd7fa514 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_testing" -version = "0.8.0-rc1" +version = "0.8.0-rc2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" @@ -11,16 +11,16 @@ keywords = ["serialization"] build = "build.rs" [features] -nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] +unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"] [build-dependencies] -serde_codegen = { version = "*", features = ["with-syntex"] } +serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] } [dev-dependencies] fnv = "1.0" rustc-serialize = "^0.3.16" -serde = "*" -serde_test = "*" +serde = { path = "../serde" } +serde_test = { path = "../serde_test" } [dependencies] clippy = { version = "^0.*", optional = true } diff --git a/testing/benches/bench.rs b/testing/benches/bench.rs index d83323ae..e5b10c57 100644 --- a/testing/benches/bench.rs +++ b/testing/benches/bench.rs @@ -1,6 +1,6 @@ #![feature(test)] -#![cfg_attr(feature = "nightly", feature(plugin))] -#![cfg_attr(feature = "nightly", plugin(clippy))] +#![cfg_attr(feature = "clippy", feature(plugin))] +#![cfg_attr(feature = "clippy", plugin(clippy))] extern crate rustc_serialize; extern crate serde; diff --git a/testing/tests/test.rs b/testing/tests/test.rs index cd90cf1e..43b89f44 100644 --- a/testing/tests/test.rs +++ b/testing/tests/test.rs @@ -1,4 +1,4 @@ -#![cfg_attr(feature = "nightly", feature(plugin))] -#![cfg_attr(feature = "nightly", plugin(clippy))] +#![cfg_attr(feature = "clippy", feature(plugin))] +#![cfg_attr(feature = "clippy", plugin(clippy))] include!(concat!(env!("OUT_DIR"), "/test.rs")); diff --git a/testing/tests/test_de.rs b/testing/tests/test_de.rs index 08c06af6..8a73bf38 100644 --- a/testing/tests/test_de.rs +++ b/testing/tests/test_de.rs @@ -764,7 +764,7 @@ declare_tests! { } } -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] #[test] fn test_net_ipaddr() { assert_de_tokens( diff --git a/testing/tests/test_ser.rs b/testing/tests/test_ser.rs index e772e05e..5fc7bf12 100644 --- a/testing/tests/test_ser.rs +++ b/testing/tests/test_ser.rs @@ -347,7 +347,7 @@ declare_ser_tests! { } } -#[cfg(feature = "nightly")] +#[cfg(feature = "unstable")] #[test] fn test_net_ipaddr() { assert_ser_tokens(