Merge #40

40: Upgrade to Rust 2021 r=stlankes a=mkroening Co-authored-by: Martin Kröning <mkroening@posteo.net> Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
hermit-os · Nov 23, 2021 · 8617c73 · 8617c73
2 parents 6baad92 + 34d7bb4
commit 8617c73
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.6"
 authors = ["Stefan Lankes <slankes@eonerc.rwth-aachen.de>", "Colin Finck <colin.finck@rwth-aachen.de>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [features]
 aarch64-qemu-stdout = []    # Output to special qemu address 0x3F20_1000 instead of trying to use uart

diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
@@ -6,7 +6,6 @@ pub mod serial;
 pub use self::bootinfo::*;
 use crate::arch::x86_64::paging::{BasePageSize, LargePageSize, PageSize, PageTableEntryFlags};
 use crate::arch::x86_64::serial::SerialPort;
-use core::convert::TryInto;
 use core::ptr::copy;
 use core::{mem, slice};
 use goblin::elf;

diff --git a/src/kernel.rs b/src/kernel.rs
@@ -1,8 +1,5 @@
 use crate::arch::{self, get_memory, BOOT_INFO};
-use core::{
-	convert::TryInto,
-	ptr::{copy_nonoverlapping, write_bytes},
-};
+use core::ptr::{copy_nonoverlapping, write_bytes};
 use goblin::{
 	container::{Container, Ctx, Endian},
 	elf::{header, program_header, reloc, Dynamic, Elf, Header, ProgramHeader, RelocSection},