fix nightly >= 2020-04-02. release 0.3.9

Author: wangrunji0408

.github/workflows/rust.yml

@@ -19,6 +19,8 @@ jobs:
         - nightly-2020-03-04
         - nightly-2020-03-10
         - nightly-2020-03-11
+        - nightly-2020-04-01
+        - nightly-2020-04-02
 
     steps:
     - uses: actions/checkout@v2

Cargo.toml

@@ -5,7 +5,7 @@ documentation = "https://docs.rs/buddy_system_allocator"
 homepage = "https://github.com/rcore-os/buddy_system_allocator"
 repository = "https://github.com/rcore-os/buddy_system_allocator"
 keywords = ["allocator", "no_std", "heap"]
-version = "0.3.8"
+version = "0.3.9"
 authors = ["Jiajie Chen <noc@jiegec.ac.cn>"]
 edition = "2018"
 license = "MIT"

src/lib.rs

@@ -17,6 +17,8 @@ use alloc::alloc::Alloc;
 #[rustversion::since(2020-02-02)]
 use alloc::alloc::AllocRef;
 use alloc::alloc::{AllocErr, Layout};
+#[rustversion::since(2020-04-02)]
+use alloc::alloc::{AllocInit, MemoryBlock};
 use core::alloc::GlobalAlloc;
 use core::cmp::{max, min};
 use core::fmt;
@@ -223,11 +225,25 @@ unsafe impl AllocRef for Heap {
         self.alloc(layout).map(|p| (p, layout.size()))
     }
 
-    #[rustversion::since(2020-03-10)]
+    #[rustversion::all(since(2020-03-10), before(2020-04-02))]
     fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
         self.alloc(layout).map(|p| (p, layout.size()))
     }
 
+    #[rustversion::since(2020-04-02)]
+    fn alloc(&mut self, layout: Layout, init: AllocInit) -> Result<MemoryBlock, AllocErr> {
+        self.alloc(layout).map(|p| {
+            let block = MemoryBlock {
+                ptr: p,
+                size: layout.size(),
+            };
+            unsafe {
+                init.init(block);
+            }
+            block
+        })
+    }
+
     unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) {
         self.dealloc(ptr, layout)
     }