Make sure that signatures aren't accidental refinements

compiler-errors · compiler-errors · commit 33871c97ab67 · 2023-04-28T17:36:49.000Z
diff --git a/library/alloc/src/collections/btree/map.rs b/library/alloc/src/collections/btree/map.rs
@@ -1543,11 +1543,17 @@ impl<'a, K: 'a, V: 'a> Iterator for Iter<'a, K, V> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<(&'a K, &'a V)> {
+    fn min(mut self) -> Option<(&'a K, &'a V)>
+    where
+        (&'a K, &'a V): Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<(&'a K, &'a V)> {
+    fn max(mut self) -> Option<(&'a K, &'a V)>
+    where
+        (&'a K, &'a V): Ord,
+    {
         self.next_back()
     }
 }
@@ -1612,11 +1618,17 @@ impl<'a, K, V> Iterator for IterMut<'a, K, V> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<(&'a K, &'a mut V)> {
+    fn min(mut self) -> Option<(&'a K, &'a mut V)>
+    where
+        (&'a K, &'a mut V): Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<(&'a K, &'a mut V)> {
+    fn max(mut self) -> Option<(&'a K, &'a mut V)>
+    where
+        (&'a K, &'a mut V): Ord,
+    {
         self.next_back()
     }
 }
@@ -1779,11 +1791,17 @@ impl<'a, K, V> Iterator for Keys<'a, K, V> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<&'a K> {
+    fn min(mut self) -> Option<&'a K>
+    where
+        &'a K: Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<&'a K> {
+    fn max(mut self) -> Option<&'a K>
+    where
+        &'a K: Ord,
+    {
         self.next_back()
     }
 }
@@ -2008,11 +2026,17 @@ impl<'a, K, V> Iterator for Range<'a, K, V> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<(&'a K, &'a V)> {
+    fn min(mut self) -> Option<(&'a K, &'a V)>
+    where
+        (&'a K, &'a V): Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<(&'a K, &'a V)> {
+    fn max(mut self) -> Option<(&'a K, &'a V)>
+    where
+        (&'a K, &'a V): Ord,
+    {
         self.next_back()
     }
 }
@@ -2081,11 +2105,17 @@ impl<K, V, A: Allocator + Clone> Iterator for IntoKeys<K, V, A> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<K> {
+    fn min(mut self) -> Option<K>
+    where
+        K: Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<K> {
+    fn max(mut self) -> Option<K>
+    where
+        K: Ord,
+    {
         self.next_back()
     }
 }
@@ -2204,11 +2234,17 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<(&'a K, &'a mut V)> {
+    fn min(mut self) -> Option<(&'a K, &'a mut V)>
+    where
+        (&'a K, &'a mut V): Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<(&'a K, &'a mut V)> {
+    fn max(mut self) -> Option<(&'a K, &'a mut V)>
+    where
+        (&'a K, &'a mut V): Ord,
+    {
         self.next_back()
     }
 }
diff --git a/library/alloc/src/collections/btree/set.rs b/library/alloc/src/collections/btree/set.rs
@@ -1501,11 +1501,17 @@ impl<'a, T> Iterator for Iter<'a, T> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<&'a T> {
+    fn min(mut self) -> Option<&'a T>
+    where
+        &'a T: Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<&'a T> {
+    fn max(mut self) -> Option<&'a T>
+    where
+        &'a T: Ord,
+    {
         self.next_back()
     }
 }
@@ -1604,11 +1610,17 @@ impl<'a, T> Iterator for Range<'a, T> {
         self.next_back()
     }
 
-    fn min(mut self) -> Option<&'a T> {
+    fn min(mut self) -> Option<&'a T>
+    where
+        &'a T: Ord,
+    {
         self.next()
     }
 
-    fn max(mut self) -> Option<&'a T> {
+    fn max(mut self) -> Option<&'a T>
+    where
+        &'a T: Ord,
+    {
         self.next_back()
     }
 }
diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs
@@ -2815,7 +2815,7 @@ impl<'a, T: 'a + Copy, A: Allocator> Extend<&'a T> for VecDeque<T, A> {
     }
 
     #[inline]
-    fn extend_one(&mut self, &elem: &T) {
+    fn extend_one(&mut self, &elem: &'a T) {
         self.push_back(elem);
     }
 
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
@@ -248,7 +248,7 @@ where
 impl<'a, T, const N: usize> TryFrom<&'a [T]> for &'a [T; N] {
     type Error = TryFromSliceError;
 
-    fn try_from(slice: &[T]) -> Result<&[T; N], TryFromSliceError> {
+    fn try_from(slice: &'a [T]) -> Result<&'a [T; N], TryFromSliceError> {
         if slice.len() == N {
             let ptr = slice.as_ptr() as *const [T; N];
             // SAFETY: ok because we just checked that the length fits
@@ -275,7 +275,7 @@ impl<'a, T, const N: usize> TryFrom<&'a [T]> for &'a [T; N] {
 impl<'a, T, const N: usize> TryFrom<&'a mut [T]> for &'a mut [T; N] {
     type Error = TryFromSliceError;
 
-    fn try_from(slice: &mut [T]) -> Result<&mut [T; N], TryFromSliceError> {
+    fn try_from(slice: &'a mut [T]) -> Result<&'a mut [T; N], TryFromSliceError> {
         if slice.len() == N {
             let ptr = slice.as_mut_ptr() as *mut [T; N];
             // SAFETY: ok because we just checked that the length fits
diff --git a/library/core/src/iter/range.rs b/library/core/src/iter/range.rs
@@ -732,12 +732,18 @@ impl<A: Step> Iterator for ops::Range<A> {
     }
 
     #[inline]
-    fn min(mut self) -> Option<A> {
+    fn min(mut self) -> Option<A>
+    where
+        A: Ord,
+    {
         self.next()
     }
 
     #[inline]
-    fn max(mut self) -> Option<A> {
+    fn max(mut self) -> Option<A>
+    where
+        A: Ord,
+    {
         self.next_back()
     }
 
@@ -1158,12 +1164,18 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
     }
 
     #[inline]
-    fn min(mut self) -> Option<A> {
+    fn min(mut self) -> Option<A>
+    where
+        A: Ord,
+    {
         self.next()
     }
 
     #[inline]
-    fn max(mut self) -> Option<A> {
+    fn max(mut self) -> Option<A>
+    where
+        A: Ord,
+    {
         self.next_back()
     }
 
diff --git a/library/portable-simd/crates/core_simd/src/ops/deref.rs b/library/portable-simd/crates/core_simd/src/ops/deref.rs
@@ -71,7 +71,7 @@ macro_rules! deref_ops {
 
                 #[inline]
                 #[must_use = "operator returns a new vector without mutating the inputs"]
-                fn $call(self, rhs: &$simd) -> Self::Output {
+                fn $call(self, rhs: &'rhs $simd) -> Self::Output {
                     (*self).$call(*rhs)
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1543,11 +1543,17 @@ impl<'a, K: 'a, V: 'a> Iterator for Iter<'a, K, V> {`
`1543`	`1543`	`self.next_back()`
`1544`	`1544`	`}`
`1545`	`1545`
`1546`		`- fn min(mut self) -> Option<(&'a K, &'a V)> {`
	`1546`	`+ fn min(mut self) -> Option<(&'a K, &'a V)>`
	`1547`	`+ where`
	`1548`	`+ (&'a K, &'a V): Ord,`
	`1549`	`+ {`
`1547`	`1550`	`self.next()`
`1548`	`1551`	`}`
`1549`	`1552`
`1550`		`- fn max(mut self) -> Option<(&'a K, &'a V)> {`
	`1553`	`+ fn max(mut self) -> Option<(&'a K, &'a V)>`
	`1554`	`+ where`
	`1555`	`+ (&'a K, &'a V): Ord,`
	`1556`	`+ {`
`1551`	`1557`	`self.next_back()`
`1552`	`1558`	`}`
`1553`	`1559`	`}`
`@@ -1612,11 +1618,17 @@ impl<'a, K, V> Iterator for IterMut<'a, K, V> {`
`1612`	`1618`	`self.next_back()`
`1613`	`1619`	`}`
`1614`	`1620`
`1615`		`- fn min(mut self) -> Option<(&'a K, &'a mut V)> {`
	`1621`	`+ fn min(mut self) -> Option<(&'a K, &'a mut V)>`
	`1622`	`+ where`
	`1623`	`+ (&'a K, &'a mut V): Ord,`
	`1624`	`+ {`
`1616`	`1625`	`self.next()`
`1617`	`1626`	`}`
`1618`	`1627`
`1619`		`- fn max(mut self) -> Option<(&'a K, &'a mut V)> {`
	`1628`	`+ fn max(mut self) -> Option<(&'a K, &'a mut V)>`
	`1629`	`+ where`
	`1630`	`+ (&'a K, &'a mut V): Ord,`
	`1631`	`+ {`
`1620`	`1632`	`self.next_back()`
`1621`	`1633`	`}`
`1622`	`1634`	`}`
`@@ -1779,11 +1791,17 @@ impl<'a, K, V> Iterator for Keys<'a, K, V> {`
`1779`	`1791`	`self.next_back()`
`1780`	`1792`	`}`
`1781`	`1793`
`1782`		`- fn min(mut self) -> Option<&'a K> {`
	`1794`	`+ fn min(mut self) -> Option<&'a K>`
	`1795`	`+ where`
	`1796`	`+ &'a K: Ord,`
	`1797`	`+ {`
`1783`	`1798`	`self.next()`
`1784`	`1799`	`}`
`1785`	`1800`
`1786`		`- fn max(mut self) -> Option<&'a K> {`
	`1801`	`+ fn max(mut self) -> Option<&'a K>`
	`1802`	`+ where`
	`1803`	`+ &'a K: Ord,`
	`1804`	`+ {`
`1787`	`1805`	`self.next_back()`
`1788`	`1806`	`}`
`1789`	`1807`	`}`
`@@ -2008,11 +2026,17 @@ impl<'a, K, V> Iterator for Range<'a, K, V> {`
`2008`	`2026`	`self.next_back()`
`2009`	`2027`	`}`
`2010`	`2028`
`2011`		`- fn min(mut self) -> Option<(&'a K, &'a V)> {`
	`2029`	`+ fn min(mut self) -> Option<(&'a K, &'a V)>`
	`2030`	`+ where`
	`2031`	`+ (&'a K, &'a V): Ord,`
	`2032`	`+ {`
`2012`	`2033`	`self.next()`
`2013`	`2034`	`}`
`2014`	`2035`
`2015`		`- fn max(mut self) -> Option<(&'a K, &'a V)> {`
	`2036`	`+ fn max(mut self) -> Option<(&'a K, &'a V)>`
	`2037`	`+ where`
	`2038`	`+ (&'a K, &'a V): Ord,`
	`2039`	`+ {`
`2016`	`2040`	`self.next_back()`
`2017`	`2041`	`}`
`2018`	`2042`	`}`
`@@ -2081,11 +2105,17 @@ impl<K, V, A: Allocator + Clone> Iterator for IntoKeys<K, V, A> {`
`2081`	`2105`	`self.next_back()`
`2082`	`2106`	`}`
`2083`	`2107`
`2084`		`- fn min(mut self) -> Option<K> {`
	`2108`	`+ fn min(mut self) -> Option<K>`
	`2109`	`+ where`
	`2110`	`+ K: Ord,`
	`2111`	`+ {`
`2085`	`2112`	`self.next()`
`2086`	`2113`	`}`
`2087`	`2114`
`2088`		`- fn max(mut self) -> Option<K> {`
	`2115`	`+ fn max(mut self) -> Option<K>`
	`2116`	`+ where`
	`2117`	`+ K: Ord,`
	`2118`	`+ {`
`2089`	`2119`	`self.next_back()`
`2090`	`2120`	`}`
`2091`	`2121`	`}`
`@@ -2204,11 +2234,17 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {`
`2204`	`2234`	`self.next_back()`
`2205`	`2235`	`}`
`2206`	`2236`
`2207`		`- fn min(mut self) -> Option<(&'a K, &'a mut V)> {`
	`2237`	`+ fn min(mut self) -> Option<(&'a K, &'a mut V)>`
	`2238`	`+ where`
	`2239`	`+ (&'a K, &'a mut V): Ord,`
	`2240`	`+ {`
`2208`	`2241`	`self.next()`
`2209`	`2242`	`}`
`2210`	`2243`
`2211`		`- fn max(mut self) -> Option<(&'a K, &'a mut V)> {`
	`2244`	`+ fn max(mut self) -> Option<(&'a K, &'a mut V)>`
	`2245`	`+ where`
	`2246`	`+ (&'a K, &'a mut V): Ord,`
	`2247`	`+ {`
`2212`	`2248`	`self.next_back()`
`2213`	`2249`	`}`
`2214`	`2250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1501,11 +1501,17 @@ impl<'a, T> Iterator for Iter<'a, T> {`
`1501`	`1501`	`self.next_back()`
`1502`	`1502`	`}`
`1503`	`1503`
`1504`		`- fn min(mut self) -> Option<&'a T> {`
	`1504`	`+ fn min(mut self) -> Option<&'a T>`
	`1505`	`+ where`
	`1506`	`+ &'a T: Ord,`
	`1507`	`+ {`
`1505`	`1508`	`self.next()`
`1506`	`1509`	`}`
`1507`	`1510`
`1508`		`- fn max(mut self) -> Option<&'a T> {`
	`1511`	`+ fn max(mut self) -> Option<&'a T>`
	`1512`	`+ where`
	`1513`	`+ &'a T: Ord,`
	`1514`	`+ {`
`1509`	`1515`	`self.next_back()`
`1510`	`1516`	`}`
`1511`	`1517`	`}`
`@@ -1604,11 +1610,17 @@ impl<'a, T> Iterator for Range<'a, T> {`
`1604`	`1610`	`self.next_back()`
`1605`	`1611`	`}`
`1606`	`1612`
`1607`		`- fn min(mut self) -> Option<&'a T> {`
	`1613`	`+ fn min(mut self) -> Option<&'a T>`
	`1614`	`+ where`
	`1615`	`+ &'a T: Ord,`
	`1616`	`+ {`
`1608`	`1617`	`self.next()`
`1609`	`1618`	`}`
`1610`	`1619`
`1611`		`- fn max(mut self) -> Option<&'a T> {`
	`1620`	`+ fn max(mut self) -> Option<&'a T>`
	`1621`	`+ where`
	`1622`	`+ &'a T: Ord,`
	`1623`	`+ {`
`1612`	`1624`	`self.next_back()`
`1613`	`1625`	`}`
`1614`	`1626`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2815,7 +2815,7 @@ impl<'a, T: 'a + Copy, A: Allocator> Extend<&'a T> for VecDeque<T, A> {`
`2815`	`2815`	`}`
`2816`	`2816`
`2817`	`2817`	`#[inline]`
`2818`		`- fn extend_one(&mut self, &elem: &T) {`
	`2818`	`+ fn extend_one(&mut self, &elem: &'a T) {`
`2819`	`2819`	`self.push_back(elem);`
`2820`	`2820`	`}`
`2821`	`2821`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ macro_rules! deref_ops {`
`71`	`71`
`72`	`72`	`#[inline]`
`73`	`73`	`#[must_use = "operator returns a new vector without mutating the inputs"]`
`74`		`- fn $call(self, rhs: &$simd) -> Self::Output {`
	`74`	`+ fn $call(self, rhs: &'rhs $simd) -> Self::Output {`
`75`	`75`	`(self).$call(rhs)`
`76`	`76`	`}`
`77`	`77`	`}`