diff options
author | est31 <est31@users.noreply.github.com> | 2019-10-25 21:05:31 +0200 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2019-10-25 14:05:31 -0500 |
commit | 8995cef9d6c347c275ea6bbbe0c45523df1b1314 (patch) | |
tree | 7cf48ffd82b44b4ff089ce2c4b74eccaa9c0fbfd /src | |
parent | 9ed2903517fe1e63e70fb2138a22296aa434da9e (diff) | |
download | milf-rs-8995cef9d6c347c275ea6bbbe0c45523df1b1314.tar.gz milf-rs-8995cef9d6c347c275ea6bbbe0c45523df1b1314.zip |
Spanned: impl PartialEq, Eq, Hash, PartialOrd, Ord in terms of the value (#344)
* Spanned: impl PartialEq, Eq, Hash, PartialOrd, Ord in terms of the value
This is because we want to be able to index into HashMap<Spanned<String>, T>
with a dummy span and get results where only the content has to match.
* Add Borrow impl
* Add tests
Diffstat (limited to 'src')
-rw-r--r-- | src/spanned.rs | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/src/spanned.rs b/src/spanned.rs index e3c2774..9ee56ae 100644 --- a/src/spanned.rs +++ b/src/spanned.rs @@ -1,5 +1,8 @@ use serde::{de, ser}; +use std::borrow::Borrow; +use std::cmp::Ordering; use std::fmt; +use std::hash::{Hash, Hasher}; pub(crate) const NAME: &str = "$__toml_private_Spanned"; pub(crate) const START: &str = "$__toml_private_start"; @@ -28,7 +31,7 @@ pub(crate) const VALUE: &str = "$__toml_private_value"; /// assert_eq!(u.s.into_inner(), String::from("value")); /// } /// ``` -#[derive(Clone, Debug, PartialEq, Eq, Hash)] +#[derive(Clone, Debug)] pub struct Spanned<T> { /// The start range. start: usize, @@ -70,6 +73,38 @@ impl<T> Spanned<T> { } } +impl Borrow<str> for Spanned<String> { + fn borrow(&self) -> &str { + &self.get_ref() + } +} + +impl<T: PartialEq> PartialEq for Spanned<T> { + fn eq(&self, other: &Self) -> bool { + self.value.eq(&other.value) + } +} + +impl<T: Eq> Eq for Spanned<T> {} + +impl<T: Hash> Hash for Spanned<T> { + fn hash<H: Hasher>(&self, state: &mut H) { + self.value.hash(state); + } +} + +impl<T: PartialOrd> PartialOrd for Spanned<T> { + fn partial_cmp(&self, other: &Self) -> Option<Ordering> { + self.value.partial_cmp(&other.value) + } +} + +impl<T: Ord> Ord for Spanned<T> { + fn cmp(&self, other: &Self) -> Ordering { + self.value.cmp(&other.value) + } +} + impl<'de, T> de::Deserialize<'de> for Spanned<T> where T: de::Deserialize<'de>, |