diff options
| author | bors <bors@rust-lang.org> | 2025-01-30 04:12:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-30 04:12:59 +0000 |
| commit | e6f12c8b7d8d5c821c32fb2739ea01d1d874c58a (patch) | |
| tree | 74afc4f08f3b95227242678cfc3652f4497b3f81 /library/alloc/src | |
| parent | 5e5567993d8ee5f8b260cebe96f1714d134d1d96 (diff) | |
| parent | 4059a796d5ddc0f9344406418a4c828be06f999f (diff) | |
| download | rust-e6f12c8b7d8d5c821c32fb2739ea01d1d874c58a.tar.gz rust-e6f12c8b7d8d5c821c32fb2739ea01d1d874c58a.zip | |
Auto merge of #136272 - Zalathar:rollup-6s577l5, r=Zalathar
Rollup of 5 pull requests Successful merges: - #135847 (optimize slice::ptr_rotate for small rotates) - #136215 (btree/node.rs: remove incorrect comment from pop_internal_level docs) - #136252 (spastorino back from vacations) - #136254 (Rustc dev guide subtree update) - #136259 (Cleanup docs for Allocator) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/btree/node.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/alloc/src/collections/btree/node.rs b/library/alloc/src/collections/btree/node.rs index 6815ac1c193..37f784a322c 100644 --- a/library/alloc/src/collections/btree/node.rs +++ b/library/alloc/src/collections/btree/node.rs @@ -600,8 +600,8 @@ impl<K, V> NodeRef<marker::Owned, K, V, marker::LeafOrInternal> { /// no cleanup is done on any of the keys, values and other children. /// This decreases the height by 1 and is the opposite of `push_internal_level`. /// - /// Requires exclusive access to the `NodeRef` object but not to the root node; - /// it will not invalidate other handles or references to the root node. + /// Does not invalidate any handles or references pointing into the subtree + /// rooted at the first child of `self`. /// /// Panics if there is no internal level, i.e., if the root node is a leaf. pub(super) fn pop_internal_level<A: Allocator + Clone>(&mut self, alloc: A) { |
