diff options
| author | Ali Malik <mikli@amazon.com> | 2021-07-23 19:14:28 -0400 |
|---|---|---|
| committer | Ali Malik <mikli@amazon.com> | 2021-07-29 01:16:53 -0400 |
| commit | ffcf8a0d7681bb5038dc00479d824d9e20f5f989 (patch) | |
| tree | e1d26f2d82b71c3e3e29d0e51d8f9ff3b1d31b16 /library/core/src | |
| parent | e43254aad1ea5758078ace51341f31071e1e61a8 (diff) | |
| download | rust-ffcf8a0d7681bb5038dc00479d824d9e20f5f989.tar.gz rust-ffcf8a0d7681bb5038dc00479d824d9e20f5f989.zip | |
Fix may not to appropriate might not or must not
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/iter/adapters/zip.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/library/core/src/iter/adapters/zip.rs b/library/core/src/iter/adapters/zip.rs index 1eb5fa5c45f..c7e69e922c1 100644 --- a/library/core/src/iter/adapters/zip.rs +++ b/library/core/src/iter/adapters/zip.rs @@ -470,7 +470,6 @@ impl<A: Debug + TrustedRandomAccessNoCoerce, B: Debug + TrustedRandomAccessNoCoe /// /// The iterator's `size_hint` must be exact and cheap to call. /// -<<<<<<< HEAD /// `TrustedRandomAccessNoCoerce::size` may not be overridden. /// /// 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 /// 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)` /// must be safe to call provided the following conditions are met. |