Skip to content

Commit c87e63d

Browse files
committed
Fix outputs after rebase
1 parent 370d83e commit c87e63d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/liballoc/collections/btree/map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
559559
#[stable(feature = "rust1", since = "1.0.0")]
560560
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")]
561561
pub const fn new() -> BTreeMap<K, V> {
562-
BTreeMap { root: None, length: 0, alloc: PhantomData }
562+
BTreeMap { root: None, length: 0 }
563563
}
564564

565565
/// Clears the map, removing all elements.

src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
- }
6868
-
6969
- bb4 (cleanup): {
70-
- _3 = const alloc::alloc::box_free::<std::vec::Vec<u32>>(move (_2.0: std::ptr::Unique<std::vec::Vec<u32>>)) -> bb3; // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
70+
- _3 = const alloc::alloc::box_free::<std::vec::Vec<u32>, std::alloc::Global>(move (_2.0: std::ptr::Unique<std::vec::Vec<u32>>), move (_2.1: std::alloc::Global)) -> bb3; // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
7171
- // ty::Const
7272
- // + ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<std::vec::Vec<u32>, std::alloc::Global>}
7373
- // + val: Value(Scalar(<ZST>))
7474
- // mir::Constant
7575
- // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
76-
- // + literal: Const { ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>}, val: Value(Scalar(<ZST>)) }
76+
- // + literal: Const { ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<std::vec::Vec<u32>, std::alloc::Global>}, val: Value(Scalar(<ZST>)) }
7777
}
7878
}
7979

0 commit comments

Comments
 (0)