diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-04-11 12:06:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-11 12:06:58 +0200 |
| commit | 5b8e2ea520b31edaebdce12c680819e516679229 (patch) | |
| tree | 0aba04ef49c23de0d3c864805cdd84b8c6e6416e | |
| parent | 053f70332f08333bfe29d3467cd83c9cdefcfe05 (diff) | |
| parent | dbc0afa215a9b5de875d2d88d3b03e855e8d2681 (diff) | |
| download | rust-5b8e2ea520b31edaebdce12c680819e516679229.tar.gz rust-5b8e2ea520b31edaebdce12c680819e516679229.zip | |
Rollup merge of #95917 - RalfJung:thin-box-test, r=dtolnay
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 https://github.com/rust-lang/miri-test-libstd/issues/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::`.
| -rw-r--r-- | library/alloc/tests/thin_box.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/tests/thin_box.rs b/library/alloc/tests/thin_box.rs index 0fe6aaa4d00..51d2e9324bf 100644 --- a/library/alloc/tests/thin_box.rs +++ b/library/alloc/tests/thin_box.rs @@ -1,5 +1,5 @@ -use alloc::boxed::ThinBox; use core::mem::size_of; +use std::boxed::ThinBox; #[test] fn want_niche_optimization() { |