diff options
| author | bors <bors@rust-lang.org> | 2020-03-10 05:48:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-10 05:48:27 +0000 |
| commit | dd155df0a69338757ca39a2a606a6accb7b8d342 (patch) | |
| tree | 1f4a4549551e14c95a31a995a46a57536212e686 /src/liballoc/raw_vec | |
| parent | 3dbade652ed8ebac70f903e01f51cd92c4e4302c (diff) | |
| parent | 3e9efbd8b409faeaf97943699ce2a15ffb8fc629 (diff) | |
| download | rust-dd155df0a69338757ca39a2a606a6accb7b8d342.tar.gz rust-dd155df0a69338757ca39a2a606a6accb7b8d342.zip | |
Auto merge of #69879 - Centril:rollup-ryea91j, r=Centril
Rollup of 10 pull requests Successful merges: - #69475 (Remove the `no_force` query attribute) - #69514 (Remove spotlight) - #69677 (rustc_metadata: Give decoder access to whole crate store) - #69714 (Make PlaceRef take just one lifetime) - #69799 (Allow ZSTs in `AllocRef`) - #69817 (test(patterns): add patterns feature tests to borrowck test suite) - #69836 (Check if output is immediate value) - #69847 (clean up E0393 explanation) - #69861 (Add note about localization to std::fmt docs) - #69877 (Vec::new is const stable in 1.39 not 1.32) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/raw_vec')
| -rw-r--r-- | src/liballoc/raw_vec/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/raw_vec/tests.rs b/src/liballoc/raw_vec/tests.rs index 860058debe1..21a8a76d0a7 100644 --- a/src/liballoc/raw_vec/tests.rs +++ b/src/liballoc/raw_vec/tests.rs @@ -20,7 +20,7 @@ fn allocator_param() { fuel: usize, } unsafe impl AllocRef for BoundedAlloc { - unsafe fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> { + fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> { let size = layout.size(); if size > self.fuel { return Err(AllocErr); |
