pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-07-22 03:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename feature nightly-testing to unstable-testing

Browse Source
This commit is contained in:
David Tolnay
2016-07-17 13:17:23 -07:00
parent 6c18896cf5
commit 4f79829849
18 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -4
View File
@@ -18,15 +18,15 @@ before_script:
script: script:
- (cd serde && travis-cargo build) - (cd serde && travis-cargo build)
- (cd serde && travis-cargo --skip nightly test) - (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 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 alloc)
- (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
- (cd testing && travis-cargo --skip nightly test) - (cd testing && travis-cargo --skip nightly test)
- (cd testing && 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 nightly-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 --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) - (cd serde && travis-cargo --only stable doc)
after_success: after_success:
- (cd serde && travis-cargo --only stable doc-upload) - (cd serde && travis-cargo --only stable doc-upload)
examples/serde-syntex-example/Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ build = "build.rs"
[features] [features]
default = ["serde_codegen"] default = ["serde_codegen"]
nightly = ["serde_macros"] unstable = ["serde_macros"]
[build-dependencies] [build-dependencies]
serde_codegen = { version = "^0.7", optional = true } serde_codegen = { version = "^0.7", optional = true }
serde/Cargo.toml
+3 -3
View File
@@ -16,10 +16,10 @@ include = ["Cargo.toml", "src/**/*.rs"]
default = ["std"] default = ["std"]
std = [] std = []
nightly = [] unstable = []
alloc = ["nightly"] alloc = ["unstable"]
collections = ["alloc"] collections = ["alloc"]
nightly-testing = ["clippy", "nightly", "std"] unstable-testing = ["clippy", "unstable", "std"]
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
serde/src/de/impls.rs
+11 -11
View File
@@ -2,7 +2,7 @@
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::borrow::Cow; 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; use collections::borrow::Cow;
#[cfg(all(feature = "collections", not(feature = "std")))] #[cfg(all(feature = "collections", not(feature = "std")))]
@@ -27,9 +27,9 @@ use std::collections::{
VecDeque, VecDeque,
}; };
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
use collections::enum_set::{CLike, EnumSet}; use collections::enum_set::{CLike, EnumSet};
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
use collections::borrow::ToOwned; use collections::borrow::ToOwned;
use core::hash::{Hash, BuildHasher}; use core::hash::{Hash, BuildHasher};
@@ -42,21 +42,21 @@ use core::str;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::rc::Rc; 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; use alloc::rc::Rc;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::sync::Arc; 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; 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; use alloc::boxed::Box;
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::nonzero::{NonZero, Zeroable}; use core::nonzero::{NonZero, Zeroable};
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::num::Zero; use core::num::Zero;
use de::{ use de::{
@@ -461,7 +461,7 @@ seq_impl!(
BTreeSet::new(), BTreeSet::new(),
BTreeSet::insert); BTreeSet::insert);
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
seq_impl!( seq_impl!(
EnumSet<T>, EnumSet<T>,
EnumSetVisitor<T: Deserialize + CLike>, EnumSetVisitor<T: Deserialize + CLike>,
@@ -806,7 +806,7 @@ map_impl!(
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#[cfg(all(feature = "nightly", feature = "std"))] #[cfg(all(feature = "unstable", feature = "std"))]
impl Deserialize for net::IpAddr { impl Deserialize for net::IpAddr {
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
where D: Deserializer, 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<T> Deserialize for NonZero<T> where T: Deserialize + PartialEq + Zeroable + Zero { impl<T> Deserialize for NonZero<T> where T: Deserialize + PartialEq + Zeroable + Zero {
fn deserialize<D>(deserializer: &mut D) -> Result<NonZero<T>, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: &mut D) -> Result<NonZero<T>, D::Error> where D: Deserializer {
let value = try!(Deserialize::deserialize(deserializer)); let value = try!(Deserialize::deserialize(deserializer));
serde/src/de/value.rs
+1 -1
View File
@@ -25,7 +25,7 @@ use collections::{
vec, vec,
}; };
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
use collections::borrow::ToOwned; use collections::borrow::ToOwned;
use core::hash::Hash; use core::hash::Hash;
serde/src/error.rs
+2 -2
View File
@@ -4,7 +4,7 @@ use core::fmt::{Debug, Display};
/// A stand-in for `std::error::Error`, which requires no allocation. /// 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 { pub trait Error: Debug + Display + ::core::marker::Reflect {
/// A short description of the error. /// 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. /// A stand-in for `std::error::Error`, which requires no allocation.
#[cfg(not(feature = "nightly"))] #[cfg(not(feature = "unstable"))]
pub trait Error: Debug + Display { pub trait Error: Debug + Display {
/// A short description of the error. /// A short description of the error.
/// ///
serde/src/lib.rs
+8 -8
View File
@@ -11,29 +11,29 @@
#![doc(html_root_url="https://serde-rs.github.io/serde/serde")] #![doc(html_root_url="https://serde-rs.github.io/serde/serde")]
#![cfg_attr(not(feature = "std"), no_std)] #![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 = "alloc", feature(alloc))]
#![cfg_attr(feature = "collections", feature(collections, enumset))] #![cfg_attr(feature = "collections", feature(collections, enumset))]
#![cfg_attr(feature = "nightly-testing", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
#![cfg_attr(feature = "nightly-testing", allow(linkedlist))] #![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)] #![deny(missing_docs)]
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
extern crate collections; extern crate collections;
#[cfg(all(feature = "nightly", feature = "alloc"))] #[cfg(all(feature = "unstable", feature = "alloc"))]
extern crate alloc; extern crate alloc;
#[cfg(feature = "std")] #[cfg(feature = "std")]
mod core { mod core {
pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize, 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}; usize, f32, f64, char, str, num, slice, iter};
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
extern crate core; extern crate core;
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
pub use self::core::nonzero; pub use self::core::nonzero;
} }
serde/src/ser/impls.rs
+10 -10
View File
@@ -26,19 +26,19 @@ use collections::{
Vec, Vec,
}; };
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
use collections::enum_set::{CLike, EnumSet}; use collections::enum_set::{CLike, EnumSet};
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
use collections::borrow::ToOwned; use collections::borrow::ToOwned;
use core::hash::{Hash, BuildHasher}; use core::hash::{Hash, BuildHasher};
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::iter; use core::iter;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::net; use std::net;
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::num; use core::num;
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::ops; use core::ops;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::path; use std::path;
@@ -57,7 +57,7 @@ use alloc::boxed::Box;
use core::marker::PhantomData; use core::marker::PhantomData;
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
use core::nonzero::{NonZero, Zeroable}; use core::nonzero::{NonZero, Zeroable};
use super::{ use super::{
@@ -244,7 +244,7 @@ impl<T> Serialize for BTreeSet<T>
serialize_seq!(); serialize_seq!();
} }
#[cfg(all(feature = "nightly", feature = "collections"))] #[cfg(all(feature = "unstable", feature = "collections"))]
impl<T> Serialize for EnumSet<T> impl<T> Serialize for EnumSet<T>
where T: Serialize + CLike where T: Serialize + CLike
{ {
@@ -276,7 +276,7 @@ impl<T> Serialize for VecDeque<T> where T: Serialize {
serialize_seq!(); serialize_seq!();
} }
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
impl<A> Serialize for ops::Range<A> impl<A> Serialize for ops::Range<A>
where A: Serialize + Clone + iter::Step + num::One, where A: Serialize + Clone + iter::Step + num::One,
for<'a> &'a A: ops::Add<&'a A, Output = A>, for<'a> &'a A: ops::Add<&'a A, Output = A>,
@@ -619,7 +619,7 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#[cfg(all(feature = "std", feature = "nightly"))] #[cfg(all(feature = "std", feature = "unstable"))]
impl Serialize for net::IpAddr { impl Serialize for net::IpAddr {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
where S: Serializer, where S: Serializer,
@@ -704,7 +704,7 @@ impl Serialize for path::PathBuf {
} }
} }
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
impl<T> Serialize for NonZero<T> where T: Serialize + Zeroable { impl<T> Serialize for NonZero<T> where T: Serialize + Zeroable {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer { fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
(**self).serialize(serializer) (**self).serialize(serializer)
serde_codegen/Cargo.toml
+2 -2
View File
@@ -14,8 +14,8 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
[features] [features]
default = ["with-syntex"] default = ["with-syntex"]
nightly = ["quasi_macros"] unstable = ["quasi_macros"]
nightly-testing = ["clippy"] unstable-testing = ["clippy"]
with-syntex = [ with-syntex = [
"quasi/with-syntex", "quasi/with-syntex",
"quasi_codegen", "quasi_codegen",
serde_codegen/src/lib.rs
+4 -4
View File
@@ -1,7 +1,7 @@
#![cfg_attr(feature = "nightly-testing", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
#![cfg_attr(feature = "nightly-testing", feature(plugin))] #![cfg_attr(feature = "clippy", feature(plugin))]
#![cfg_attr(feature = "nightly-testing", allow(too_many_arguments))] #![cfg_attr(feature = "clippy", allow(too_many_arguments))]
#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))] #![cfg_attr(feature = "clippy", allow(used_underscore_binding))]
#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))] #![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
serde_codegen_internals/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
[features] [features]
default = ["with-syntex"] default = ["with-syntex"]
nightly-testing = ["clippy"] unstable-testing = ["clippy"]
with-syntex = ["syntex_syntax", "syntex_errors"] with-syntex = ["syntex_syntax", "syntex_errors"]
[dependencies] [dependencies]
serde_codegen_internals/src/lib.rs
+2 -2
View File
@@ -1,5 +1,5 @@
#![cfg_attr(feature = "nightly-testing", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
#![cfg_attr(feature = "nightly-testing", feature(plugin))] #![cfg_attr(feature = "clippy", feature(plugin))]
#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
#[cfg(feature = "with-syntex")] #[cfg(feature = "with-syntex")]
serde_macros/Cargo.toml
+2 -2
View File
@@ -16,11 +16,11 @@ name = "serde_macros"
plugin = true plugin = true
[features] [features]
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
serde_codegen = { version = "^0.8.0-rc1", default-features = false, features = ["nightly"] } serde_codegen = { version = "^0.8.0-rc1", default-features = false, features = ["unstable"] }
[dev-dependencies] [dev-dependencies]
clippy = "^0.*" clippy = "^0.*"
testing/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ keywords = ["serialization"]
build = "build.rs" build = "build.rs"
[features] [features]
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
[build-dependencies] [build-dependencies]
serde_codegen = { version = "*", features = ["with-syntex"] } serde_codegen = { version = "*", features = ["with-syntex"] }
testing/benches/bench.rs
+2 -2
View File
@@ -1,6 +1,6 @@
#![feature(test)] #![feature(test)]
#![cfg_attr(feature = "nightly", feature(plugin))] #![cfg_attr(feature = "clippy", feature(plugin))]
#![cfg_attr(feature = "nightly", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
extern crate rustc_serialize; extern crate rustc_serialize;
extern crate serde; extern crate serde;
testing/tests/test.rs
+2 -2
View File
@@ -1,4 +1,4 @@
#![cfg_attr(feature = "nightly", feature(plugin))] #![cfg_attr(feature = "clippy", feature(plugin))]
#![cfg_attr(feature = "nightly", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
include!(concat!(env!("OUT_DIR"), "/test.rs")); include!(concat!(env!("OUT_DIR"), "/test.rs"));
testing/tests/test_de.rs
+1 -1
View File
@@ -764,7 +764,7 @@ declare_tests! {
} }
} }
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
#[test] #[test]
fn test_net_ipaddr() { fn test_net_ipaddr() {
assert_de_tokens( assert_de_tokens(
testing/tests/test_ser.rs
+1 -1
View File
@@ -347,7 +347,7 @@ declare_ser_tests! {
} }
} }
#[cfg(feature = "nightly")] #[cfg(feature = "unstable")]
#[test] #[test]
fn test_net_ipaddr() { fn test_net_ipaddr() {
assert_ser_tokens( assert_ser_tokens(