Skip to content

Commit cac792e

Browse files
committed
API: Rename feature flag serde-1 to serde
(Old concerns don't matter anymore, especially with renamed deps.)
1 parent 8c3dfbc commit cac792e

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ harness = false
3737
[features]
3838
default = ["std"]
3939
std = []
40-
serde-1 = ["serde"]
4140

4241
array-sizes-33-128 = []
4342
array-sizes-129-255 = []
4443

4544
[package.metadata.docs.rs]
46-
features = ["serde-1"]
45+
features = ["serde"]
4746

4847
[package.metadata.release]
4948
no-dev-version = true

src/array_string.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::array::Index;
1414
use crate::CapacityError;
1515
use crate::char::encode_utf8;
1616

17-
#[cfg(feature="serde-1")]
17+
#[cfg(feature="serde")]
1818
use serde::{Serialize, Deserialize, Serializer, Deserializer};
1919

2020
use super::MaybeUninit as MaybeUninitCopy;
@@ -518,8 +518,8 @@ impl<A> FromStr for ArrayString<A>
518518
}
519519
}
520520

521-
#[cfg(feature="serde-1")]
522-
/// Requires crate feature `"serde-1"`
521+
#[cfg(feature="serde")]
522+
/// Requires crate feature `"serde"`
523523
impl<A> Serialize for ArrayString<A>
524524
where A: Array<Item=u8> + Copy
525525
{
@@ -530,8 +530,8 @@ impl<A> Serialize for ArrayString<A>
530530
}
531531
}
532532

533-
#[cfg(feature="serde-1")]
534-
/// Requires crate feature `"serde-1"`
533+
#[cfg(feature="serde")]
534+
/// Requires crate feature `"serde"`
535535
impl<'de, A> Deserialize<'de> for ArrayString<A>
536536
where A: Array<Item=u8> + Copy
537537
{

src/lib.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//! - Optional, enabled by default
88
//! - Use libstd; disable to use `no_std` instead.
99
//!
10-
//! - `serde-1`
10+
//! - `serde`
1111
//! - Optional
12-
//! - Enable serialization for ArrayVec and ArrayString using serde 1.0
12+
//! - Enable serialization for ArrayVec and ArrayString using serde 1.x
1313
//! - `array-sizes-33-128`, `array-sizes-129-255`
1414
//! - Optional
1515
//! - Enable more array sizes (see [Array] for more information)
@@ -21,7 +21,7 @@
2121
#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
2222
#![cfg_attr(not(feature="std"), no_std)]
2323

24-
#[cfg(feature="serde-1")]
24+
#[cfg(feature="serde")]
2525
extern crate serde;
2626

2727
#[cfg(not(feature="std"))]
@@ -46,7 +46,7 @@ use std::io;
4646
mod maybe_uninit;
4747
use crate::maybe_uninit::MaybeUninit;
4848

49-
#[cfg(feature="serde-1")]
49+
#[cfg(feature="serde")]
5050
use serde::{Serialize, Deserialize, Serializer, Deserializer};
5151

5252
mod array;
@@ -1104,8 +1104,8 @@ impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
11041104
fn flush(&mut self) -> io::Result<()> { Ok(()) }
11051105
}
11061106

1107-
#[cfg(feature="serde-1")]
1108-
/// Requires crate feature `"serde-1"`
1107+
#[cfg(feature="serde")]
1108+
/// Requires crate feature `"serde"`
11091109
impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
11101110
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
11111111
where S: Serializer
@@ -1114,8 +1114,8 @@ impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
11141114
}
11151115
}
11161116

1117-
#[cfg(feature="serde-1")]
1118-
/// Requires crate feature `"serde-1"`
1117+
#[cfg(feature="serde")]
1118+
/// Requires crate feature `"serde"`
11191119
impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
11201120
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
11211121
where D: Deserializer<'de>

0 commit comments

Comments
 (0)