Skip to content

Add a Display variant to Value. #85

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
chanks wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add a Display variant to Value. #85

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89de54e
Add a Display variant to Value.
chanks Feb 7, 2022
c23e632
Use Display from core, rather than std.
chanks Feb 7, 2022
08f7adb
add `From<&'a dyn Display>` for `Value`
hawkw Mar 3, 2022
b6adbd6
handle other variants in `Value::as_display`
hawkw Mar 3, 2022
3b983db
quote `Display` values in `Debug` impl
hawkw Mar 3, 2022
3b1abd6
serde: serialize `Display` values
hawkw Mar 3, 2022
da29a85
Merge branch 'master' into eliza/chanks/display
hawkw Mar 7, 2022
8b40f38
Merge pull request #1 from tokio-rs/eliza/chanks/display
chanks Mar 8, 2022
85826ef
Merge branch 'master' into chanks/display
hawkw Mar 8, 2022
4212a91
Update valuable/src/value.rs
chanks Mar 8, 2022
61bb35b
Tupleable -> Tuplable
chanks Mar 8, 2022
2f57fb3
Fix doctest failure.
chanks Mar 8, 2022
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
50 changes: 50 additions & 0 deletions valuable/src/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,27 @@ macro_rules! value {
$variant($ty),
)*

/// An arbitrary value that implements Display.
///
/// # Examples
///
/// ```
/// use std::fmt;
/// use valuable::{Value, Valuable};
///
/// struct Meters(u32);
///
/// impl fmt::Display for Meters {
/// fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
/// write!(f, "{}m", self.0)
/// }
/// }
///
/// let meters = Meters(5);
/// let v = Value::Display(&meters);
/// ```
Display(&'a dyn fmt::Display),

/// A Rust `()` or `None` value.
///
/// # Examples
Expand Down Expand Up @@ -104,6 +125,7 @@ macro_rules! value {
$(#[$attrs])*
$variant(v) => fmt::Debug::fmt(v, fmt),
)*
Display(d) => d.fmt(fmt),
Copy link
Member

@hawkw hawkw Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder if we want to quote this while debug printing it? it's essentially a different way of recording a string, and strings are quoted in fmt::Debug. @carllerche WDYT?

Unit => ().fmt(fmt),
}
}
Expand Down Expand Up @@ -690,6 +712,34 @@ macro_rules! convert {
_ => None,
}
}

/// Return a `&dyn Display` representation of `self`, if possible.
///
/// # Examples
///
/// ```
/// use std::fmt;
/// use valuable::{Value, Valuable};
///
/// struct Meters(u32);
///
/// impl fmt::Display for Meters {
/// fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
/// write!(f, "{}m", self.0)
/// }
/// }
///
/// let meters = Meters(5);
///
/// assert!(Value::Display(&meters).as_display().is_some());
/// assert!(Value::Bool(true).as_display().is_none());
/// ```
pub fn as_display(&self) -> Option<&dyn fmt::Display> {
match *self {
Value::Display(v) => Some(v),
_ => None,
}
}
}
}
}
Expand Down