Rename serde-1 back to serde

Cargo.toml

@@ -27,7 +27,6 @@ name = "chrono"
 default = ["clock", "std"]
 alloc = []
 std = []
-serde-1 = ["serde", "alloc"]
 clock = ["time", "std"]
 wasmbind = ["wasm-bindgen", "js-sys"]
 

README.md

@@ -52,7 +52,7 @@ feature like this:
 
 ```toml
 [dependencies]
-chrono = { version = "0.4", features = ["serde-1"] }
+chrono = { version = "0.4", features = ["serde"] }
 ```
 
 Then put this in your crate root:

ci/travis.sh

@@ -48,20 +48,20 @@ build_and_test_nonwasm() {
   TZ=ACST-9:30 channel test -v --lib
   channel build -v --features rustc-serialize
   TZ=EST4 channel test -v --features rustc-serialize --lib
-  channel build -v --features serde-1
-  TZ=UTC0 channel test -v --features serde-1 --lib
-  channel build -v --features serde-1,rustc-serialize
-  TZ=Asia/Katmandu channel test -v --features serde-1,rustc-serialize
+  channel build -v --features serde
+  TZ=UTC0 channel test -v --features serde --lib
+  channel build -v --features serde,rustc-serialize
+  TZ=Asia/Katmandu channel test -v --features serde,rustc-serialize
 
   # without default "clock" feature
   channel build -v --no-default-features --features std
   TZ=ACST-9:30 channel test -v --no-default-features --lib
   channel build -v --no-default-features --features std,rustc-serialize
   TZ=EST4 channel test -v --no-default-features --features rustc-serialize --lib
-  channel build -v --no-default-features --features std,serde-1
-  TZ=UTC0 channel test -v --no-default-features --features serde-1 --lib
-  channel build -v --no-default-features --features std,serde-1,rustc-serialize
-  TZ=Asia/Katmandu channel test -v --no-default-features --features std,serde-1,rustc-serialize --lib
+  channel build -v --no-default-features --features std,serde
+  TZ=UTC0 channel test -v --no-default-features --features serde --lib
+  channel build -v --no-default-features --features std,serde,rustc-serialize
+  TZ=Asia/Katmandu channel test -v --no-default-features --features std,serde,rustc-serialize --lib
 }
 
 build_and_test_wasm() {
@@ -81,15 +81,16 @@ build_only() {
   cargo clean
   channel build -v
   channel build -v --features rustc-serialize
-  channel build -v --features 'serde-1 bincode'
+  channel build -v --features 'serde bincode'
   channel build -v --no-default-features --features std
 }
 
 build_core_test() {
     rustup target add thumbv6m-none-eabi --toolchain $CHANNEL
-    cd ci/core-test
-    channel build -v --target thumbv6m-none-eabi
-    cd ../..
+    (
+        cd ci/core-test
+        channel build -v --target thumbv6m-none-eabi
+    )
 }
 
 run_clippy() {
@@ -99,7 +100,7 @@ run_clippy() {
         exit
     fi
 
-    cargo clippy --features 'serde-1 bincode rustc-serialize' -- -Dclippy
+    cargo clippy --features 'serde bincode rustc-serialize' -- -Dclippy
 }
 
 check_readme() {

src/datetime.rs

@@ -918,7 +918,7 @@ pub mod rustc_serialize {
 }
 
 /// documented at re-export site
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 pub mod serde {
     use core::fmt;
     #[cfg(not(any(feature = "std", test)))]

src/lib.rs

@@ -418,7 +418,7 @@ extern crate num_integer;
 extern crate num_traits;
 #[cfg(feature = "rustc-serialize")]
 extern crate rustc_serialize;
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 extern crate serde as serdelib;
 #[cfg(test)]
 #[macro_use]
@@ -497,7 +497,7 @@ pub mod naive {
     ///
     /// [1]: https://serde.rs/attributes.html#field-attributes
     /// [2]: https://tools.ietf.org/html/rfc3339
-    #[cfg(feature = "serde-1")]
+    #[cfg(feature = "serde")]
     pub mod serde {
         pub use super::datetime::serde::*;
     }
@@ -515,7 +515,7 @@ mod round;
 ///
 /// [1]: https://serde.rs/attributes.html#field-attributes
 /// [2]: https://tools.ietf.org/html/rfc3339
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 pub mod serde {
     pub use super::datetime::serde::*;
 }
@@ -703,7 +703,7 @@ impl fmt::Debug for ParseWeekdayError {
 
 // the actual `FromStr` implementation is in the `format` module to leverage the existing code
 
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 mod weekday_serde {
     use super::Weekday;
     use core::fmt;

src/naive/date.rs

@@ -1602,7 +1602,7 @@ mod rustc_serialize {
     }
 }
 
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 mod serde {
     use core::fmt;
     #[cfg(not(any(feature = "std", test)))]

src/naive/datetime.rs

@@ -1665,7 +1665,7 @@ pub mod rustc_serialize {
 }
 
 /// Tools to help serializing/deserializing `NaiveDateTime`s
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 pub mod serde {
     use core::fmt;
     #[cfg(not(any(feature = "std", test)))]

src/naive/time.rs

@@ -1413,7 +1413,7 @@ mod rustc_serialize {
     }
 }
 
-#[cfg(feature = "serde-1")]
+#[cfg(feature = "serde")]
 mod serde {
     use core::fmt;
     #[cfg(not(any(feature = "std", test)))]