diff options
| author | bors <bors@rust-lang.org> | 2024-07-29 05:19:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-29 05:19:10 +0000 |
| commit | a5ee5cbad1dde83dde61959e9436716094e3408c (patch) | |
| tree | 12450124ab22020a8af917a09187f373e84824d5 /library/alloc/src | |
| parent | 2e630267b2bce50af3258ce4817e377fa09c145b (diff) | |
| parent | 0c6d2fb3dcd987667d2b82c531326cfd401f1afa (diff) | |
| download | rust-a5ee5cbad1dde83dde61959e9436716094e3408c.tar.gz rust-a5ee5cbad1dde83dde61959e9436716094e3408c.zip | |
Auto merge of #128330 - matthiaskrgr:rollup-auairjd, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #109174 (Replace `io::Cursor::{remaining_slice, is_empty}`)
- #127290 (Fully document `rustdoc-json-types`)
- #128055 (std: unsafe-wrap personality::dwarf::eh)
- #128269 (improve cargo invocations on bootstrap)
- #128310 (Add missing periods on `BTreeMap` cursor `peek_next` docs)
Failed merges:
- #127543 (More unsafe attr verification)
- #128182 (handle no_std targets on std builds)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/btree/map.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/alloc/src/collections/btree/map.rs b/library/alloc/src/collections/btree/map.rs index 8fe4cd7144b..d84654e36d7 100644 --- a/library/alloc/src/collections/btree/map.rs +++ b/library/alloc/src/collections/btree/map.rs @@ -2921,7 +2921,7 @@ impl<'a, K, V> Cursor<'a, K, V> { /// Returns a reference to the key and value of the next element without /// moving the cursor. /// - /// If the cursor is at the end of the map then `None` is returned + /// If the cursor is at the end of the map then `None` is returned. #[unstable(feature = "btree_cursors", issue = "107540")] pub fn peek_next(&self) -> Option<(&'a K, &'a V)> { self.clone().next() @@ -2963,7 +2963,7 @@ impl<'a, K, V, A> CursorMut<'a, K, V, A> { /// Returns a reference to the key and value of the next element without /// moving the cursor. /// - /// If the cursor is at the end of the map then `None` is returned + /// If the cursor is at the end of the map then `None` is returned. #[unstable(feature = "btree_cursors", issue = "107540")] pub fn peek_next(&mut self) -> Option<(&K, &mut V)> { let (k, v) = self.inner.peek_next()?; @@ -3061,7 +3061,7 @@ impl<'a, K, V, A> CursorMutKey<'a, K, V, A> { /// Returns a reference to the key and value of the next element without /// moving the cursor. /// - /// If the cursor is at the end of the map then `None` is returned + /// If the cursor is at the end of the map then `None` is returned. #[unstable(feature = "btree_cursors", issue = "107540")] pub fn peek_next(&mut self) -> Option<(&mut K, &mut V)> { let current = self.current.as_mut()?; |
