Skip to content

Commit

Permalink
Auto merge of rust-lang#96622 - JohnTitor:rollup-8hckgaj, r=JohnTitor
Browse files Browse the repository at this point in the history
Rollup of 7 pull requests

Successful merges:

 - rust-lang#94126 (Classify BinaryHeap & LinkedList unit tests as such)
 - rust-lang#96222 (Clarify docs for `from_raw_parts` on `Vec` and `String`)
 - rust-lang#96499 (Make it possible to write doctests for bootstrap)
 - rust-lang#96567 (Fix docs for u32 and i32 logs func)
 - rust-lang#96568 (std::fmt: Various fixes and improvements to documentation)
 - rust-lang#96571 (Add a bathroom stall to weird expressions test)
 - rust-lang#96610 (Update browser-ui-test version to 0.9.0)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed May 2, 2022
2 parents 4c5efea + 5750e33 commit f6cbc92
Show file tree
Hide file tree
Showing 14 changed files with 756 additions and 723 deletions.
3 changes: 3 additions & 0 deletions library/alloc/src/collections/binary_heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ use crate::vec::{self, AsVecIntoIter, Vec};

use super::SpecExtend;

#[cfg(test)]
mod tests;

/// A priority queue implemented with a binary heap.
///
/// This will be a max-heap.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::collections::binary_heap::{Drain, PeekMut};
use std::collections::BinaryHeap;
use super::*;
use crate::boxed::Box;
use std::iter::TrustedLen;
use std::panic::{catch_unwind, AssertUnwindSafe};
use std::sync::atomic::{AtomicU32, Ordering};
Expand Down
Loading

0 comments on commit f6cbc92

Please sign in to comment.