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.

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

suggestions for #85 #1

Merged
merged 6 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 24 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,37 @@ jobs:
- run: cargo hack build --workspace --feature-powerset

# When this job failed, run ci/no_atomic.sh and commit result changes.
# TODO(taiki-e): Ideally, this should be automated using a bot that creates
# PR when failed, but there is no bandwidth to implement it
# right now...
codegen:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update nightly && rustup default nightly
- run: ci/no_atomic.sh
- run: git diff --exit-code
- run: git add -N . && git diff --exit-code
if: github.repository_owner != 'tokio-rs' || github.event_name != 'schedule'
- id: diff
run: |
git config user.name "Taiki Endo"
git config user.email "[email protected]"
git add -N .
if ! git diff --exit-code; then
git add .
git commit -m "Update no_atomic.rs"
echo "::set-output name=success::false"
fi
if: github.repository_owner == 'tokio-rs' && github.event_name == 'schedule'
- uses: peter-evans/create-pull-request@v3
with:
title: Update no_atomic.rs
body: |
Auto-generated by [create-pull-request][1]
[Please close and immediately reopen this pull request to run CI.][2]

[1]: https://github.com/peter-evans/create-pull-request
[2]: https://github.com/peter-evans/create-pull-request/blob/HEAD/docs/concepts-guidelines.md#workarounds-to-trigger-further-workflow-runs
branch: update-no-atomic-rs
if: github.repository_owner == 'tokio-rs' && github.event_name == 'schedule' && steps.diff.outputs.success == 'false'

fmt:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions valuable-serde/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ where
Value::Path(p) => Serialize::serialize(p, serializer),
#[cfg(feature = "std")]
Value::Error(e) => Err(S::Error::custom(e)),
Value::Display(d) => serializer.collect_str(d),

v => unimplemented!("{:?}", v),
}
Expand Down
1 change: 0 additions & 1 deletion valuable/no_atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const NO_ATOMIC_64: &[&str] = &[
"riscv32gc-unknown-linux-gnu",
"riscv32gc-unknown-linux-musl",
"riscv32imac-unknown-none-elf",
"riscv32imc-esp-espidf",
"thumbv7em-none-eabi",
"thumbv7em-none-eabihf",
"thumbv7m-none-eabi",
Expand Down
47 changes: 44 additions & 3 deletions valuable/src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ macro_rules! value {
}
}

impl<'a> From<&'a dyn fmt::Display> for Value<'a> {
fn from(src: &'a dyn fmt::Display) -> Self {
Self::Display(src)
}
}

impl fmt::Debug for Value<'_> {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
use Value::*;
Expand All @@ -125,7 +131,7 @@ macro_rules! value {
$(#[$attrs])*
$variant(v) => fmt::Debug::fmt(v, fmt),
)*
Display(d) => d.fmt(fmt),
Display(d) => write!(fmt, "\"{}\"", d),
Unit => ().fmt(fmt),
}
}
Expand Down Expand Up @@ -715,6 +721,12 @@ macro_rules! convert {

/// Return a `&dyn Display` representation of `self`, if possible.
///
/// If this value is a [`Value::Display`] variant, or any primitive
/// `Value` variant, this method will return a `&dyn Display` trait
/// object. Otherwise, if the value is [`Structable`],
/// [`Enumerable`], [`Tupleable`], [`Listable`], [`Mappable`], or a
/// [`Value::Path`], this method will return `None`.
///
/// # Examples
///
/// ```
Expand All @@ -732,11 +744,40 @@ macro_rules! convert {
/// let meters = Meters(5);
///
/// assert!(Value::Display(&meters).as_display().is_some());
/// assert!(Value::Bool(true).as_display().is_none());
/// assert!(Value::Tupleable((true, "hello")).as_display().is_none());
/// ```
pub fn as_display(&self) -> Option<&dyn fmt::Display> {
use Value::*;
match *self {
Value::Display(v) => Some(v),
I8(ref v) => Some(v),
I16(ref v) => Some(v),
I32(ref v) => Some(v),
I64(ref v) => Some(v),
I128(ref v) => Some(v),
Isize(ref v) => Some(v),
U8(ref v) => Some(v),
U16(ref v) => Some(v),
U32(ref v) => Some(v),
U64(ref v) => Some(v),
U128(ref v) => Some(v),
Usize(ref v) => Some(v),
F32(ref v) => Some(v),
F64(ref v) => Some(v),
Bool(ref v) => Some(v),
Char(ref v) => Some(v),
String(ref v) => Some(v),

#[cfg(feature = "std")]
Error(ref v) => Some(v),

// XXX(eliza): this, sadly, does not work for `Path`s; the
// only way to return them as a `Display` impl is
// `Path::display`, which creates a value owned by _this_
// function; we can't return that as a trait object because
// we're borrowing it from the function's scope rather than
// from the value itself.

Display(v) => Some(v),
_ => None,
}
}
Expand Down