From 408f7b57470d1761297e1490a38ecb79ad6e4657 Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Tue, 10 Feb 2015 22:12:13 +0100 Subject: [PATCH 1/2] Modify collection's `Debug` output to resemble in their content only --- src/libcollections/bit.rs | 6 +++--- src/libcollections/enum_set.rs | 8 ++++---- src/libcollections/linked_list.rs | 6 +++--- src/libcollections/vec_deque.rs | 6 +++--- src/libcollections/vec_map.rs | 6 +++--- src/libstd/collections/hash/map.rs | 8 ++++---- src/libstd/collections/hash/set.rs | 6 +++--- src/test/run-pass/issue-3559.rs | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index f28f9976f0c5..f2447abf42cd 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -978,7 +978,7 @@ impl Ord for BitVec { impl fmt::Debug for BitVec { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { for bit in self { - try!(write!(fmt, "{}", if bit { 1u32 } else { 0u32 })); + try!(write!(fmt, "{}", if bit { 1 } else { 0 })); } Ok(()) } @@ -1752,7 +1752,7 @@ impl BitSet { #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for BitSet { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - try!(write!(fmt, "BitSet {{")); + try!(write!(fmt, "{{")); let mut first = true; for n in self { if !first { @@ -2655,7 +2655,7 @@ mod bit_set_test { s.insert(10); s.insert(50); s.insert(2); - assert_eq!("BitSet {1, 2, 10, 50}", format!("{:?}", s)); + assert_eq!("{1, 2, 10, 50}", format!("{:?}", s)); } #[test] diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 0c9574260608..bc14093ffa2c 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -36,7 +36,7 @@ impl Copy for EnumSet {} #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for EnumSet { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - try!(write!(fmt, "EnumSet {{")); + try!(write!(fmt, "{{")); let mut first = true; for e in self { if !first { @@ -314,11 +314,11 @@ mod test { #[test] fn test_show() { let mut e = EnumSet::new(); - assert!(format!("{:?}", e) == "EnumSet {}"); + assert!(format!("{:?}", e) == "{}"); e.insert(A); - assert!(format!("{:?}", e) == "EnumSet {A}"); + assert!(format!("{:?}", e) == "{A}"); e.insert(C); - assert!(format!("{:?}", e) == "EnumSet {A, C}"); + assert!(format!("{:?}", e) == "{A, C}"); } #[test] diff --git a/src/libcollections/linked_list.rs b/src/libcollections/linked_list.rs index 3c61fc3da90e..c446e3d39988 100644 --- a/src/libcollections/linked_list.rs +++ b/src/libcollections/linked_list.rs @@ -918,7 +918,7 @@ impl Clone for LinkedList { #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for LinkedList { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "LinkedList [")); + try!(write!(f, "[")); for (i, e) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -1387,10 +1387,10 @@ mod tests { #[test] fn test_show() { let list: LinkedList<_> = (0..10).collect(); - assert_eq!(format!("{:?}", list), "LinkedList [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); + assert_eq!(format!("{:?}", list), "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); let list: LinkedList<_> = vec!["just", "one", "test", "more"].iter().cloned().collect(); - assert_eq!(format!("{:?}", list), "LinkedList [\"just\", \"one\", \"test\", \"more\"]"); + assert_eq!(format!("{:?}", list), "[\"just\", \"one\", \"test\", \"more\"]"); } #[cfg(test)] diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs index f65e644fa528..8b6949e02fee 100644 --- a/src/libcollections/vec_deque.rs +++ b/src/libcollections/vec_deque.rs @@ -1754,7 +1754,7 @@ impl Extend for VecDeque { #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for VecDeque { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "VecDeque [")); + try!(write!(f, "[")); for (i, e) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -2435,12 +2435,12 @@ mod tests { #[test] fn test_show() { let ringbuf: VecDeque<_> = (0..10).collect(); - assert_eq!(format!("{:?}", ringbuf), "VecDeque [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); + assert_eq!(format!("{:?}", ringbuf), "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); let ringbuf: VecDeque<_> = vec!["just", "one", "test", "more"].iter() .cloned() .collect(); - assert_eq!(format!("{:?}", ringbuf), "VecDeque [\"just\", \"one\", \"test\", \"more\"]"); + assert_eq!(format!("{:?}", ringbuf), "[\"just\", \"one\", \"test\", \"more\"]"); } #[test] diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index d92249379fa8..d2a4f6c04373 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -739,7 +739,7 @@ impl Ord for VecMap { #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for VecMap { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "VecMap {{")); + try!(write!(f, "{{")); for (i, (k, v)) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -1318,8 +1318,8 @@ mod test_map { map.insert(3, 4); let map_str = format!("{:?}", map); - assert!(map_str == "VecMap {1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}"); - assert_eq!(format!("{:?}", empty), "VecMap {}"); + assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}"); + assert_eq!(format!("{:?}", empty), "{}"); } #[test] diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index df2fb538c0a5..faddbba50590 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1212,7 +1212,7 @@ impl Debug for HashMap where K: Eq + Hash + Debug, V: Debug, S: HashState { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "HashMap {{")); + try!(write!(f, "{{")); for (i, (k, v)) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -1999,9 +1999,9 @@ mod test_map { let map_str = format!("{:?}", map); - assert!(map_str == "HashMap {1: 2, 3: 4}" || - map_str == "HashMap {3: 4, 1: 2}"); - assert_eq!(format!("{:?}", empty), "HashMap {}"); + assert!(map_str == "{1: 2, 3: 4}" || + map_str == "{3: 4, 1: 2}"); + assert_eq!(format!("{:?}", empty), "{}"); } #[test] diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index e0631a64d44b..cdc0ebd76aad 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -598,7 +598,7 @@ impl fmt::Debug for HashSet S: HashState { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "HashSet {{")); + try!(write!(f, "{{")); for (i, x) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -1186,8 +1186,8 @@ mod test_set { let set_str = format!("{:?}", set); - assert!(set_str == "HashSet {1, 2}" || set_str == "HashSet {2, 1}"); - assert_eq!(format!("{:?}", empty), "HashSet {}"); + assert!(set_str == "{1, 2}" || set_str == "{2, 1}"); + assert_eq!(format!("{:?}", empty), "{}"); } #[test] diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs index 754412ea9493..3f1a1c75d8a7 100644 --- a/src/test/run-pass/issue-3559.rs +++ b/src/test/run-pass/issue-3559.rs @@ -24,6 +24,6 @@ pub fn main() { let mut table = HashMap::new(); table.insert("one".to_string(), 1); table.insert("two".to_string(), 2); - assert!(check_strs(&format!("{:?}", table), "HashMap {\"one\": 1, \"two\": 2}") || - check_strs(&format!("{:?}", table), "HashMap {\"two\": 2, \"one\": 1}")); + assert!(check_strs(&format!("{:?}", table), "{\"one\": 1, \"two\": 2}") || + check_strs(&format!("{:?}", table), "{\"two\": 2, \"one\": 1}")); } From 870ad3bc75ef25a01b81ff115ab307d21c738a0f Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Wed, 11 Feb 2015 00:14:48 +0100 Subject: [PATCH 2/2] Change `Debug` implementation of `BTree*` as well --- src/libcollections/btree/map.rs | 2 +- src/libcollections/btree/set.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index 1b456eec830b..9e0e7fad6be4 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -899,7 +899,7 @@ impl Ord for BTreeMap { #[stable(feature = "rust1", since = "1.0.0")] impl Debug for BTreeMap { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "BTreeMap {{")); + try!(write!(f, "{{")); for (i, (k, v)) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index 929b2f580430..4273f9a82300 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -613,7 +613,7 @@ impl<'a, 'b, T: Ord + Clone> BitOr<&'b BTreeSet> for &'a BTreeSet { #[stable(feature = "rust1", since = "1.0.0")] impl Debug for BTreeSet { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "BTreeSet {{")); + try!(write!(f, "{{")); for (i, x) in self.iter().enumerate() { if i != 0 { try!(write!(f, ", ")); } @@ -911,7 +911,7 @@ mod test { let set_str = format!("{:?}", set); - assert_eq!(set_str, "BTreeSet {1, 2}"); - assert_eq!(format!("{:?}", empty), "BTreeSet {}"); + assert_eq!(set_str, "{1, 2}"); + assert_eq!(format!("{:?}", empty), "{}"); } }