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 { /// The start range. start: usize, @@ -70,6 +73,38 @@ impl Spanned { } } +impl Borrow for Spanned { + fn borrow(&self) -> &str { + &self.get_ref() + } +} + +impl PartialEq for Spanned { + fn eq(&self, other: &Self) -> bool { + self.value.eq(&other.value) + } +} + +impl Eq for Spanned {} + +impl Hash for Spanned { + fn hash(&self, state: &mut H) { + self.value.hash(state); + } +} + +impl PartialOrd for Spanned { + fn partial_cmp(&self, other: &Self) -> Option { + self.value.partial_cmp(&other.value) + } +} + +impl Ord for Spanned { + fn cmp(&self, other: &Self) -> Ordering { + self.value.cmp(&other.value) + } +} + impl<'de, T> de::Deserialize<'de> for Spanned where T: de::Deserialize<'de>, diff --git a/test-suite/tests/spanned-impls.rs b/test-suite/tests/spanned-impls.rs new file mode 100644 index 0000000..cb12b1a --- /dev/null +++ b/test-suite/tests/spanned-impls.rs @@ -0,0 +1,41 @@ +use std::cmp::{Ord, Ordering, PartialOrd}; +use toml::{from_str, Spanned}; +#[macro_use] +extern crate serde_derive; + +#[test] +fn test_spans_impls() { + #[derive(Deserialize)] + struct Foo { + bar: Spanned, + baz: Spanned, + } + let f: Foo = from_str( + " + bar = true + baz = \"yes\" + ", + ) + .unwrap(); + let g: Foo = from_str( + " + baz = \"yes\" + bar = true + ", + ) + .unwrap(); + assert!(f.bar.span() != g.bar.span()); + assert!(f.baz.span() != g.baz.span()); + + // test that eq still holds + assert_eq!(f.bar, g.bar); + assert_eq!(f.baz, g.baz); + + // test that Ord returns equal order + assert_eq!(f.bar.cmp(&g.bar), Ordering::Equal); + assert_eq!(f.baz.cmp(&g.baz), Ordering::Equal); + + // test that PartialOrd returns equal order + assert_eq!(f.bar.partial_cmp(&g.bar), Some(Ordering::Equal)); + assert_eq!(f.baz.partial_cmp(&g.baz), Some(Ordering::Equal)); +}