diff options
| author | bors <bors@rust-lang.org> | 2020-05-12 10:28:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-12 10:28:08 +0000 |
| commit | d903a9def4c29846ec6215ccc7fa76d39428f577 (patch) | |
| tree | aa59db539531cfd59fe1af12db6363baaff96632 /src/liballoc/alloc | |
| parent | 09c817eeb29e764cfc12d0a8d94841e3ffe34023 (diff) | |
| parent | ceeb9bdee6de1883012be5894c360b34b644fa44 (diff) | |
| download | rust-d903a9def4c29846ec6215ccc7fa76d39428f577.tar.gz rust-d903a9def4c29846ec6215ccc7fa76d39428f577.zip | |
Auto merge of #72134 - Dylan-DPC:rollup-h3shfz5, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71737 (Miri: run liballoc tests with threads) - #71928 (Add strikethrough support to rustdoc) - #72048 (Visit move out of `_0` when visiting `return`) - #72096 (Make MIR typeck use `LocalDefId` and fix docs) - #72128 (strings do not have to be valid UTF-8 any more) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/alloc')
| -rw-r--r-- | src/liballoc/alloc/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/alloc/tests.rs b/src/liballoc/alloc/tests.rs index 1ad40eca93b..1c003983df9 100644 --- a/src/liballoc/alloc/tests.rs +++ b/src/liballoc/alloc/tests.rs @@ -23,7 +23,7 @@ fn allocate_zeroed() { } #[bench] -#[cfg_attr(miri, ignore)] // Miri does not support benchmarks +#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks fn alloc_owned_small(b: &mut Bencher) { b.iter(|| { let _: Box<_> = box 10; |