Skip to content

Commit 7ff3ad0

Browse files
bors[bot]mkroening
andauthored
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 <[email protected]>
3 parents 842b671 + ba1658b + c704016 commit 7ff3ad0

File tree

3 files changed

+3
-255
lines changed

3 files changed

+3
-255
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
### Rust
55
# Generated by Cargo
66
# will have compiled files and executables
7-
/target/
7+
/target
8+
Cargo.lock
89

910
# These are backup files generated by rustfmt
1011
**/*.rs.bk

Cargo.lock

Lines changed: 0 additions & 252 deletions
This file was deleted.

src/syscalls/interfaces/uhyve.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
// http://opensource.org/licenses/MIT>, at your option. This file may not be
66
// copied, modified, or distributed except according to those terms.
77

8-
use alloc::prelude::v1::Box;
9-
use alloc::vec::Vec;
8+
use alloc::{boxed::Box, vec::Vec};
109
use core::mem;
1110

1211
#[cfg(target_arch = "x86_64")]

0 commit comments

Comments
 (0)