Skip to content
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

Jump to bottom

Allow Key and KeyOrValue to be treated as Data #1571

Merged
merged 1 commit into from
Feb 8, 2021
Merged

Allow Key and KeyOrValue to be treated as Data #1571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion druid/src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ struct EnvImpl {
///
/// [`ValueType`]: trait.ValueType.html
/// [`Env`]: struct.Env.html
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, PartialEq, Data)]
pub struct Key<T> {
key: &'static str,
value_type: PhantomData<T>,
Expand Down Expand Up @@ -134,6 +134,16 @@ pub enum KeyOrValue<T> {
Key(Key<T>),
}

impl<T: Data> Data for KeyOrValue<T> {
fn same(&self, other: &Self) -> bool {
match (self, other) {
(Self::Concrete(a), Self::Concrete(b)) => a.same(b),
(Self::Key(a), Self::Key(b)) => a.same(b),
_ => false,
}
}
}

/// A trait for anything that can resolve a value of some type from the [`Env`].
///
/// This is a generalization of the idea of [`KeyOrValue`], mostly motivated
Expand Down