Auto merge of #42854 - razielgn:relaxed-debug-constraints-on-maps-iterators, r=sfackler

bors · bors · commit 7e76505e0105 · 2017-06-24T09:32:20.000Z
Relaxed Debug constraints on {HashMap,BTreeMap}::{Keys,Values}. I has hit by this yesterday too. 😄 And I've realised that Debug for BTreeMap::{Keys,Values} wasn't formatting just keys and values respectively, but the whole map. 🤔 Fixed #41924 r? @jonhoo
diff --git a/src/liballoc/btree/map.rs b/src/liballoc/btree/map.rs
@@ -334,9 +334,9 @@ pub struct Keys<'a, K: 'a, V: 'a> {
 }
 
 #[stable(feature = "collection_debug", since = "1.17.0")]
-impl<'a, K: 'a + fmt::Debug, V: 'a + fmt::Debug> fmt::Debug for Keys<'a, K, V> {
+impl<'a, K: 'a + fmt::Debug, V: 'a> fmt::Debug for Keys<'a, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list().entries(self.inner.clone()).finish()
+        f.debug_list().entries(self.clone()).finish()
     }
 }
 
@@ -353,9 +353,9 @@ pub struct Values<'a, K: 'a, V: 'a> {
 }
 
 #[stable(feature = "collection_debug", since = "1.17.0")]
-impl<'a, K: 'a + fmt::Debug, V: 'a + fmt::Debug> fmt::Debug for Values<'a, K, V> {
+impl<'a, K: 'a, V: 'a + fmt::Debug> fmt::Debug for Values<'a, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list().entries(self.inner.clone()).finish()
+        f.debug_list().entries(self.clone()).finish()
     }
 }
 
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
@@ -1407,7 +1407,7 @@ impl<'a, K, V> Clone for Keys<'a, K, V> {
 }
 
 #[stable(feature = "std_debug", since = "1.16.0")]
-impl<'a, K: Debug, V: Debug> fmt::Debug for Keys<'a, K, V> {
+impl<'a, K: Debug, V> fmt::Debug for Keys<'a, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_list()
             .entries(self.clone())
@@ -1436,7 +1436,7 @@ impl<'a, K, V> Clone for Values<'a, K, V> {
 }
 
 #[stable(feature = "std_debug", since = "1.16.0")]
-impl<'a, K: Debug, V: Debug> fmt::Debug for Values<'a, K, V> {
+impl<'a, K, V: Debug> fmt::Debug for Values<'a, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_list()
             .entries(self.clone())

Original file line number	Diff line number	Diff line change
`@@ -334,9 +334,9 @@ pub struct Keys<'a, K: 'a, V: 'a> {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`#[stable(feature = "collection_debug", since = "1.17.0")]`
`337`		`-impl<'a, K: 'a + fmt::Debug, V: 'a + fmt::Debug> fmt::Debug for Keys<'a, K, V> {`
	`337`	`+impl<'a, K: 'a + fmt::Debug, V: 'a> fmt::Debug for Keys<'a, K, V> {`
`338`	`338`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`339`		`- f.debug_list().entries(self.inner.clone()).finish()`
	`339`	`+ f.debug_list().entries(self.clone()).finish()`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`@@ -353,9 +353,9 @@ pub struct Values<'a, K: 'a, V: 'a> {`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`#[stable(feature = "collection_debug", since = "1.17.0")]`
`356`		`-impl<'a, K: 'a + fmt::Debug, V: 'a + fmt::Debug> fmt::Debug for Values<'a, K, V> {`
	`356`	`+impl<'a, K: 'a, V: 'a + fmt::Debug> fmt::Debug for Values<'a, K, V> {`
`357`	`357`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`358`		`- f.debug_list().entries(self.inner.clone()).finish()`
	`358`	`+ f.debug_list().entries(self.clone()).finish()`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`