Skip to content

Add where clause on generics in derive #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adityashah1212 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add where clause on generics in derive #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfdc527
Add where clause on generics in derive
Aug 13, 2026
d937a9d
CI fixes due to changes in rust version
Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions tests/tests/derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,44 @@ fn test_transparent() {
assert!(matches!(Valuable::as_value(&T('a')), Value::Char('a')));
}

#[test]
fn test_derive_generic() {
#[derive(Valuable)]
struct GenericStruct<T> {
value: T,
}

#[derive(Valuable)]
struct MultiGeneric<T, U> {
first: T,
second: U,
}

#[derive(Valuable)]
enum GenericEnum<T> {
Value(T),
Empty,
}

let s = GenericStruct { value: 42u32 };
assert_eq!(format!("{:?}", s.as_value()), "GenericStruct { value: 42 }");

let m = MultiGeneric {
first: 1u8,
second: "hello",
};
assert_eq!(
format!("{:?}", m.as_value()),
r#"MultiGeneric { first: 1, second: "hello" }"#
);

let e = GenericEnum::Value(true);
assert_eq!(format!("{:?}", e.as_value()), "GenericEnum::Value(true)");

let e: GenericEnum<u32> = GenericEnum::Empty;
assert_eq!(format!("{:?}", e.as_value()), "GenericEnum::Empty");
}

#[rustversion::attr(not(stable), ignore)]
#[test]
fn ui() {
Expand Down
28 changes: 24 additions & 4 deletions tests/tests/ui/not_valuable.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ error[E0277]: the trait bound `S: Valuable` is not satisfied
| -------- required by a bound introduced by this call
6 | struct Struct {
7 | f: Option<S>,
| ^^^^^^^^^ the trait `Valuable` is not implemented for `S`
| ^^^^^^^^^ unsatisfied trait bound
|
help: the trait `Valuable` is not implemented for `S`
--> tests/ui/not_valuable.rs:3:1
|
3 | struct S;
| ^^^^^^^^
= help: the following other types implement trait `Valuable`:
&T
&[T]
Expand All @@ -25,8 +30,13 @@ error[E0277]: the trait bound `S: Valuable` is not satisfied
10 | #[derive(Valuable)]
| -------- required by a bound introduced by this call
11 | struct Tuple(Option<S>);
| ^^^^^^^^^ the trait `Valuable` is not implemented for `S`
| ^^^^^^^^^ unsatisfied trait bound
|
help: the trait `Valuable` is not implemented for `S`
--> tests/ui/not_valuable.rs:3:1
|
3 | struct S;
| ^^^^^^^^
= help: the following other types implement trait `Valuable`:
&T
&[T]
Expand All @@ -46,8 +56,13 @@ error[E0277]: the trait bound `S: Valuable` is not satisfied
| -------- required by a bound introduced by this call
14 | enum Enum {
15 | Struct { f: Option<S> },
| ^ the trait `Valuable` is not implemented for `S`
| ^ unsatisfied trait bound
|
help: the trait `Valuable` is not implemented for `S`
--> tests/ui/not_valuable.rs:3:1
|
3 | struct S;
| ^^^^^^^^
= help: the following other types implement trait `Valuable`:
&T
&[T]
Expand All @@ -69,8 +84,13 @@ error[E0277]: the trait bound `S: Valuable` is not satisfied
| -------- required by a bound introduced by this call
...
16 | Tuple(Option<S>),
| ^ the trait `Valuable` is not implemented for `S`
| ^ unsatisfied trait bound
|
help: the trait `Valuable` is not implemented for `S`
--> tests/ui/not_valuable.rs:3:1
|
3 | struct S;
| ^^^^^^^^
= help: the following other types implement trait `Valuable`:
&T
&[T]
Expand Down
20 changes: 18 additions & 2 deletions valuable-derive/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,15 @@ fn derive_struct(
let name = &input.ident;
let name_literal = struct_attrs.rename(name);

let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
let mut generics = input.generics.clone();
for type_param in input.generics.type_params() {
let ident = &type_param.ident;
generics
.make_where_clause()
.predicates
.push(syn::parse_quote!(#ident: ::valuable::Valuable));
}
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
let allowed_lints = allowed_lints();

if struct_attrs.transparent() {
Expand Down Expand Up @@ -350,7 +358,15 @@ fn derive_enum(cx: Context, input: &syn::DeriveInput, data: &syn::DataEnum) -> R
];
};

let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
let mut generics = input.generics.clone();
for type_param in input.generics.type_params() {
let ident = &type_param.ident;
generics
.make_where_clause()
.predicates
.push(syn::parse_quote!(#ident: ::valuable::Valuable));
}
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
let enumerable_impl = quote! {
#[automatically_derived]
impl #impl_generics ::valuable::Enumerable for #name #ty_generics #where_clause {
Expand Down
14 changes: 10 additions & 4 deletions valuable/no_atomic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const NO_ATOMIC_CAS: &[&str] = &[
"riscv32i-unknown-none-elf",
"riscv32im-unknown-none-elf",
"riscv32imc-unknown-none-elf",
"riscv64im-unknown-none-elf",
"thumbv4t-none-eabi",
"thumbv5te-none-eabi",
"thumbv6m-none-eabi",
Expand All @@ -22,9 +23,7 @@ const NO_ATOMIC_CAS: &[&str] = &[

const NO_ATOMIC_64: &[&str] = &[
"arm-linux-androideabi",
"armv4t-none-eabi",
"armv4t-unknown-linux-gnueabi",
"armv5te-none-eabi",
"armv5te-unknown-linux-gnueabi",
"armv5te-unknown-linux-musleabi",
"armv5te-unknown-linux-uclibceabi",
Expand All @@ -33,6 +32,9 @@ const NO_ATOMIC_64: &[&str] = &[
"csky-unknown-linux-gnuabiv2hf",
"hexagon-unknown-linux-musl",
"hexagon-unknown-none-elf",
"hexagon-unknown-qurt",
"loongarch32-unknown-none",
"loongarch32-unknown-none-softfloat",
"m68k-unknown-linux-gnu",
"m68k-unknown-none-elf",
"mips-mti-none-elf",
Expand All @@ -49,6 +51,7 @@ const NO_ATOMIC_64: &[&str] = &[
"mipsisa32r6-unknown-linux-gnu",
"mipsisa32r6el-unknown-linux-gnu",
"powerpc-unknown-freebsd",
"powerpc-unknown-helenos",
"powerpc-unknown-linux-gnu",
"powerpc-unknown-linux-gnuspe",
"powerpc-unknown-linux-musl",
Expand Down Expand Up @@ -78,8 +81,7 @@ const NO_ATOMIC_64: &[&str] = &[
"riscv32imc-unknown-nuttx-elf",
"sparc-unknown-linux-gnu",
"sparc-unknown-none-elf",
"thumbv4t-none-eabi",
"thumbv5te-none-eabi",
"thumbv6-none-eabi",
"thumbv6m-none-eabi",
"thumbv6m-nuttx-eabi",
"thumbv7em-none-eabi",
Expand All @@ -103,9 +105,13 @@ const NO_ATOMIC_64: &[&str] = &[
];

const NO_ATOMIC: &[&str] = &[
"armv4t-none-eabi",
"armv5te-none-eabi",
"avr-none",
"bpfeb-unknown-none",
"bpfel-unknown-none",
"mipsel-sony-psx",
"msp430-none-elf",
"thumbv4t-none-eabi",
"thumbv5te-none-eabi",
];
10 changes: 1 addition & 9 deletions valuable/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,7 @@
//! [`valuable_serde::Serializable`]: https://docs.rs/valuable-serde/latest/valuable_serde/struct.Serializable.html
//! [`serde::ser::Serializer`]: https://docs.rs/serde/latest/serde/ser/trait.Serializer.html
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg, doc_cfg_hide))]
#![cfg_attr(
docsrs,
doc(cfg_hide(
not(valuable_no_atomic_cas),
not(valuable_no_atomic),
not(valuable_no_atomic_64)
))
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

#[cfg(feature = "alloc")]
extern crate alloc;
Expand Down
Loading