diff options
Diffstat (limited to 'vendor/zerovec/src/map2d/map.rs')
| -rw-r--r-- | vendor/zerovec/src/map2d/map.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vendor/zerovec/src/map2d/map.rs b/vendor/zerovec/src/map2d/map.rs index e6545dfa5..8bdefe792 100644 --- a/vendor/zerovec/src/map2d/map.rs +++ b/vendor/zerovec/src/map2d/map.rs @@ -160,7 +160,7 @@ where pub fn as_borrowed(&'a self) -> ZeroMap2dBorrowed<'a, K0, K1, V> { ZeroMap2dBorrowed { keys0: self.keys0.zvl_as_borrowed(), - joiner: &*self.joiner, + joiner: &self.joiner, keys1: self.keys1.zvl_as_borrowed(), values: self.values.zvl_as_borrowed(), } @@ -710,7 +710,7 @@ mod test { let mut zm2d = ZeroMap2d::<u16, str, str>::new(); assert_eq!( - format!("{:?}", zm2d), + format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([]), joiner: ZeroVec([]), keys1: [], values: [] }" ); assert_eq!(zm2d.get0(&0), None); @@ -718,7 +718,7 @@ mod test { let result = zm2d.try_append(&3, "ccc", "CCC"); assert!(matches!(result, None)); - assert_eq!(format!("{:?}", zm2d), "ZeroMap2d { keys0: ZeroVec([3]), joiner: ZeroVec([1]), keys1: [\"ccc\"], values: [\"CCC\"] }"); + assert_eq!(format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([3]), joiner: ZeroVec([1]), keys1: [\"ccc\"], values: [\"CCC\"] }"); assert_eq!(zm2d.get0(&0), None); assert_eq!(zm2d.get0(&3).unwrap().get1(""), None); assert_eq!(zm2d.get_2d(&3, "ccc"), Some("CCC")); @@ -727,7 +727,7 @@ mod test { let result = zm2d.try_append(&3, "eee", "EEE"); assert!(matches!(result, None)); - assert_eq!(format!("{:?}", zm2d), "ZeroMap2d { keys0: ZeroVec([3]), joiner: ZeroVec([2]), keys1: [\"ccc\", \"eee\"], values: [\"CCC\", \"EEE\"] }"); + assert_eq!(format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([3]), joiner: ZeroVec([2]), keys1: [\"ccc\", \"eee\"], values: [\"CCC\", \"EEE\"] }"); assert_eq!(zm2d.get0(&0), None); assert_eq!(zm2d.get0(&3).unwrap().get1(""), None); assert_eq!(zm2d.get_2d(&3, "ccc"), Some("CCC")); @@ -751,7 +751,7 @@ mod test { let result = zm2d.try_append(&9, "yyy", "YYY"); assert!(matches!(result, None)); - assert_eq!(format!("{:?}", zm2d), "ZeroMap2d { keys0: ZeroVec([3, 5, 7, 9]), joiner: ZeroVec([2, 3, 6, 7]), keys1: [\"ccc\", \"eee\", \"ddd\", \"ddd\", \"eee\", \"www\", \"yyy\"], values: [\"CCC\", \"EEE\", \"DD1\", \"DD2\", \"EEE\", \"WWW\", \"YYY\"] }"); + assert_eq!(format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([3, 5, 7, 9]), joiner: ZeroVec([2, 3, 6, 7]), keys1: [\"ccc\", \"eee\", \"ddd\", \"ddd\", \"eee\", \"www\", \"yyy\"], values: [\"CCC\", \"EEE\", \"DD1\", \"DD2\", \"EEE\", \"WWW\", \"YYY\"] }"); assert_eq!(zm2d.get0(&0), None); assert_eq!(zm2d.get0(&3).unwrap().get1(""), None); assert_eq!(zm2d.get_2d(&3, "ccc"), Some("CCC")); @@ -782,7 +782,7 @@ mod test { zm2d.insert(&6, "mmm", "MM1"); zm2d.insert(&6, "nnn", "NNN"); - assert_eq!(format!("{:?}", zm2d), "ZeroMap2d { keys0: ZeroVec([3, 5, 6, 7, 9]), joiner: ZeroVec([3, 4, 7, 10, 11]), keys1: [\"ccc\", \"eee\", \"mmm\", \"ddd\", \"ddd\", \"mmm\", \"nnn\", \"ddd\", \"eee\", \"www\", \"yyy\"], values: [\"CCC\", \"EEE\", \"MM0\", \"DD1\", \"DD3\", \"MM1\", \"NNN\", \"DD2\", \"EEE\", \"WWW\", \"YYY\"] }"); + assert_eq!(format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([3, 5, 6, 7, 9]), joiner: ZeroVec([3, 4, 7, 10, 11]), keys1: [\"ccc\", \"eee\", \"mmm\", \"ddd\", \"ddd\", \"mmm\", \"nnn\", \"ddd\", \"eee\", \"www\", \"yyy\"], values: [\"CCC\", \"EEE\", \"MM0\", \"DD1\", \"DD3\", \"MM1\", \"NNN\", \"DD2\", \"EEE\", \"WWW\", \"YYY\"] }"); assert_eq!(zm2d.get0(&0), None); assert_eq!(zm2d.get0(&3).unwrap().get1(""), None); assert_eq!(zm2d.get_2d(&3, "ccc"), Some("CCC")); @@ -822,6 +822,6 @@ mod test { let result = zm2d.remove(&9, "yyy"); // last element assert_eq!(result.as_deref(), Some("YYY")); - assert_eq!(format!("{:?}", zm2d), "ZeroMap2d { keys0: ZeroVec([3, 6, 7]), joiner: ZeroVec([1, 4, 7]), keys1: [\"eee\", \"ddd\", \"mmm\", \"nnn\", \"ddd\", \"eee\", \"www\"], values: [\"EEE\", \"DD3\", \"MM1\", \"NNN\", \"DD2\", \"EEE\", \"WWW\"] }"); + assert_eq!(format!("{zm2d:?}"), "ZeroMap2d { keys0: ZeroVec([3, 6, 7]), joiner: ZeroVec([1, 4, 7]), keys1: [\"eee\", \"ddd\", \"mmm\", \"nnn\", \"ddd\", \"eee\", \"www\"], values: [\"EEE\", \"DD3\", \"MM1\", \"NNN\", \"DD2\", \"EEE\", \"WWW\"] }"); } } |