Skip to content

Commit

Permalink
Rollup merge of rust-lang#95917 - RalfJung:thin-box-test, r=dtolnay
Browse files Browse the repository at this point in the history
thin_box test: import from std, not alloc

Importing from `alloc` makes [Miri fail](https://github.com/rust-lang/miri-test-libstd/runs/5964922742?check_suite_focus=true), probably due to the hack that we used to resolve rust-lang/miri-test-libstd#4. There might be better ways around this, but for now this is the easiest thing to do -- no other alloc integration test is importing from `alloc::`.
  • Loading branch information
matthiaskrgr authored Apr 11, 2022
2 parents ca331f5 + dbc0afa commit efd6259
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/alloc/tests/thin_box.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use alloc::boxed::ThinBox;
use core::mem::size_of;
use std::boxed::ThinBox;

#[test]
fn want_niche_optimization() {
Expand Down

0 comments on commit efd6259

Please sign in to comment.