clean up `BinaryHeap` code
auto merge of #20133 : apasel422/rust/binary_heap, r=alexcrichton

Some more tidying up.