-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean up fields / field paths (#353)
- Loading branch information
Showing
16 changed files
with
769 additions
and
560 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| use core::fmt; | ||
| use std::fmt::{Display, Formatter}; | ||
|
|
||
| #[derive(Clone, Debug, PartialEq, Eq, Hash)] | ||
| #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] | ||
| pub enum Field { | ||
| Name(String), | ||
| Index(i32), | ||
| } | ||
|
|
||
| impl From<&str> for Field { | ||
| fn from(value: &str) -> Self { | ||
| Field::Name(value.into()) | ||
| } | ||
| } | ||
|
|
||
| impl From<i32> for Field { | ||
| fn from(value: i32) -> Self { | ||
| Field::Index(value) | ||
| } | ||
| } | ||
|
|
||
| impl Display for Field { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { | ||
| match self { | ||
| Field::Name(name) => write!(f, "${name}"), | ||
| Field::Index(idx) => write!(f, "[{idx}]"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, PartialEq, Eq, Hash)] | ||
| #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] | ||
| pub struct FieldPath(Vec<Field>); | ||
|
|
||
| impl FieldPath { | ||
| pub fn root() -> Self { | ||
| Self(vec![]) | ||
| } | ||
|
|
||
| pub fn from_name(name: &str) -> Self { | ||
| Self(vec![Field::from(name)]) | ||
| } | ||
|
|
||
| pub fn path(&self) -> &[Field] { | ||
| &self.0 | ||
| } | ||
|
|
||
| pub fn to_name(&self) -> &str { | ||
| assert_eq!(self.0.len(), 1); | ||
| match &self.0[0] { | ||
| Field::Name(name) => name.as_str(), | ||
| _ => panic!("FieldPath is not a name"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl FromIterator<Field> for FieldPath { | ||
| fn from_iter<T: IntoIterator<Item = Field>>(iter: T) -> Self { | ||
| FieldPath(iter.into_iter().collect()) | ||
| } | ||
| } | ||
|
|
||
| impl From<Field> for FieldPath { | ||
| fn from(value: Field) -> Self { | ||
| FieldPath(vec![value]) | ||
| } | ||
| } | ||
|
|
||
| impl From<Vec<Field>> for FieldPath { | ||
| fn from(value: Vec<Field>) -> Self { | ||
| FieldPath(value) | ||
| } | ||
| } | ||
|
|
||
| impl Display for FieldPath { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { | ||
| let formatted = self | ||
| .0 | ||
| .iter() | ||
| .map(|fid| format!("{fid}")) | ||
| .collect::<Vec<_>>() | ||
| .join("."); | ||
| write!(f, "{}", formatted) | ||
| } | ||
| } |
Oops, something went wrong.