diff options
| author | bors <bors@rust-lang.org> | 2020-03-03 10:18:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-03 10:18:57 +0000 |
| commit | a5de254862477924bcd8b9e1bff7eadd6ffb5e2a (patch) | |
| tree | 6d30e786044c654a5478545b69a9f8792e856655 /src/liballoc/alloc | |
| parent | 9381e8178b49636d4604e4ec0f1263960691c958 (diff) | |
| parent | e453a0cc49ad83fbb54fb22f9bba7545f5a92c68 (diff) | |
| download | rust-a5de254862477924bcd8b9e1bff7eadd6ffb5e2a.tar.gz rust-a5de254862477924bcd8b9e1bff7eadd6ffb5e2a.zip | |
Auto merge of #69666 - JohnTitor:rollup-6nt3op0, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #69213 (Improve documentation on iterators length) - #69609 (Remove `usable_size` APIs) - #69619 (more cleanups) - #69620 (doc(librustc_error_codes): add long error explanation for E0719) - #69626 (Toolstate: don't duplicate nightly tool list.) - #69628 (Fix a leak in `DiagnosticBuilder::into_diagnostic`.) - #69633 (Update my mailmap entry) - #69634 (clean up E0378 explanation) - #69637 (Don't convert Results to Options just for matching.) 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 c902971638b..55944398e16 100644 --- a/src/liballoc/alloc/tests.rs +++ b/src/liballoc/alloc/tests.rs @@ -8,7 +8,7 @@ use test::Bencher; fn allocate_zeroed() { unsafe { let layout = Layout::from_size_align(1024, 1).unwrap(); - let ptr = + let (ptr, _) = Global.alloc_zeroed(layout.clone()).unwrap_or_else(|_| handle_alloc_error(layout)); let mut i = ptr.cast::<u8>().as_ptr(); |