Merge #276 #289

276: Remove Cargo.lock r=stlankes a=mkroening Since we use no `Cargo.lock` in downstream builds, we should not use one in upstream CI either. 289: Remove uses of alloc::prelude r=mkroening a=mkroening alloc::prelude has been removed in rust-lang/rust#89898, effective since nightly-2021-10-17. bors r+ Co-authored-by: Martin Kröning <mkroening@posteo.net>
hermit-os · Oct 29, 2021 · 7ff3ad0 · 7ff3ad0
3 parents 842b671 + ba1658b + c704016
commit 7ff3ad0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 255 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,8 @@
 ### Rust
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+/target
+Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/syscalls/interfaces/uhyve.rs b/src/syscalls/interfaces/uhyve.rs
@@ -5,8 +5,7 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-use alloc::prelude::v1::Box;
-use alloc::vec::Vec;
+use alloc::{boxed::Box, vec::Vec};
 use core::mem;
 
 #[cfg(target_arch = "x86_64")]