mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix may not to appropriate might not or must not

Browse Source
This commit is contained in:
Ali Malik 2021-07-23 19:14:28 -04:00
parent e43254aad1
commit ffcf8a0d76
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/iter/adapters/zip.rs
View File

@ -470,7 +470,6 @@ impl<A: Debug + TrustedRandomAccessNoCoerce, B: Debug + TrustedRandomAccessNoCoe
/// ///
/// The iterator's `size_hint` must be exact and cheap to call. /// The iterator's `size_hint` must be exact and cheap to call.
/// ///
<<<<<<< HEAD
/// `TrustedRandomAccessNoCoerce::size` may not be overridden. /// `TrustedRandomAccessNoCoerce::size` may not be overridden.
/// ///
/// All subtypes and all supertypes of `Self` must also implement `TrustedRandomAccess`. /// All subtypes and all supertypes of `Self` must also implement `TrustedRandomAccess`.
@ -481,9 +480,6 @@ impl<A: Debug + TrustedRandomAccessNoCoerce, B: Debug + TrustedRandomAccessNoCoe
/// ///
/// If `Self: ExactSizeIterator` then `self.len()` must always produce results consistent /// If `Self: ExactSizeIterator` then `self.len()` must always produce results consistent
/// with `self.size()`. /// with `self.size()`.
=======
/// `size` must not be overridden.
>>>>>>> Fix may not to appropriate might not or must not
/// ///
/// If `Self: Iterator`, then `<Self as Iterator>::__iterator_get_unchecked(&mut self, idx)` /// If `Self: Iterator`, then `<Self as Iterator>::__iterator_get_unchecked(&mut self, idx)`
/// must be safe to call provided the following conditions are met. /// must be safe to call provided the following conditions are met.