From 802b5b3f2e7ae9cc9ad19e57816e7619a1b9b5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Fri, 12 Nov 2021 18:55:20 +0100 Subject: [PATCH 1/3] Upgrade toolchain channel to nightly-2021-09-29 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9f94a7ef..6071703b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2021-08-31" +channel = "nightly-2021-09-29" components = [ "rustfmt", "rust-src", "llvm-tools-preview"] From b565b36ada808e76af6ae242faa58b397a90174c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Fri, 22 Oct 2021 16:35:08 +0200 Subject: [PATCH 2/3] Upgrade to Rust 2021 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1bf6948d..bad2517b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.2.6" authors = ["Stefan Lankes ", "Colin Finck "] 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 From 34d7bb43b8f3e6538f5eed35c14bbeb6ce7ea58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Fri, 22 Oct 2021 16:36:35 +0200 Subject: [PATCH 3/3] Rust 2021: Remove new prelude uses --- src/arch/x86_64/mod.rs | 1 - src/kernel.rs | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs index d503c17c..4649d68d 100644 --- 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 index 83fb2b76..3c19cf74 100644 --- 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},