Skip to content

Commit f6cbc92

Browse files
committed
Auto merge of #96622 - JohnTitor:rollup-8hckgaj, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #94126 (Classify BinaryHeap & LinkedList unit tests as such) - #96222 (Clarify docs for `from_raw_parts` on `Vec` and `String`) - #96499 (Make it possible to write doctests for bootstrap) - #96567 (Fix docs for u32 and i32 logs func) - #96568 (std::fmt: Various fixes and improvements to documentation) - #96571 (Add a bathroom stall to weird expressions test) - #96610 (Update browser-ui-test version to 0.9.0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4c5efea + 5750e33 commit f6cbc92

File tree

14 files changed

+756
-723
lines changed

14 files changed

+756
-723
lines changed

library/alloc/src/collections/binary_heap.rs

+3
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ use crate::vec::{self, AsVecIntoIter, Vec};
155155

156156
use super::SpecExtend;
157157

158+
#[cfg(test)]
159+
mod tests;
160+
158161
/// A priority queue implemented with a binary heap.
159162
///
160163
/// This will be a max-heap.

library/alloc/tests/binary_heap.rs renamed to library/alloc/src/collections/binary_heap/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use std::collections::binary_heap::{Drain, PeekMut};
2-
use std::collections::BinaryHeap;
1+
use super::*;
2+
use crate::boxed::Box;
33
use std::iter::TrustedLen;
44
use std::panic::{catch_unwind, AssertUnwindSafe};
55
use std::sync::atomic::{AtomicU32, Ordering};

0 commit comments

Comments
 (0)