Skip to content

Commit 6e9e0d9

Browse files
committed
Fix CI
1 parent 34c7eea commit 6e9e0d9

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

.config/topic.dic

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
19
1+
20
22
≥1
33
APIs
44
Changelog
@@ -11,6 +11,7 @@ FQS
1111
invariants
1212
io
1313
MSRV
14+
Serde
1415
std's
1516
struct/S
1617
TODO

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ syn = { version = "2", default-features = false, features = [
4242
[dev-dependencies]
4343
pretty_assertions = "1"
4444
rustversion = "1"
45-
serde = { version = "1", default-features = false, features = ["derive"] }
45+
serde_ = { package = "serde", version = "1", default-features = false, features = ["derive"] }
4646
trybuild = { version = "1.0.18", default-features = false }
47-
zeroize_ = { version = "1.5", package = "zeroize", default-features = false }
47+
zeroize_ = { package = "zeroize", version = "1.5", default-features = false }
4848

4949
[package.metadata.docs.rs]
5050
all-features = true

src/lib.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,14 @@ fn derive_where_internal(mut item: DeriveInput) -> Result<TokenStream> {
541541
}
542542

543543
#[doc(hidden)]
544-
#[proc_macro_derive(DeriveWhere, attributes(derive_where))]
544+
#[cfg_attr(
545+
not(feature = "serde"),
546+
proc_macro_derive(DeriveWhere, attributes(derive_where))
547+
)]
548+
#[cfg_attr(
549+
feature = "serde",
550+
proc_macro_derive(DeriveWhere, attributes(derive_where, serde))
551+
)]
545552
#[cfg_attr(feature = "nightly", allow_internal_unstable(core_intrinsics))]
546553
pub fn derive_where_actual(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
547554
let input = TokenStream::from(input);

tests/serde.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#![cfg(feature = "serde")]
22

3+
extern crate serde_ as serde;
4+
35
use derive_where::derive_where;
46

57
#[test]
68
fn test() {
7-
#[derive_where(crate = derive_where)]
89
#[derive_where(Deserialize)]
10+
#[serde(crate = "serde_")]
911
struct Test<T>(T);
1012
}

0 commit comments

Comments
 (0)