Merge #294

294: Upgrade to Rust 2021 r=stlankes a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["unikernel", "libos"]
 categories = ["os"]
 repository = "https://github.com/hermitcore/rusty-hermit"
 documentation = "https://hermitcore.github.io/libhermit-rs/hermit/"
-edition = "2018"
+edition = "2021"
 description = "A Rust-based library operting system"
 exclude = [
 	"/.github/*",

src/arch/aarch64/mm/physicalmem.rs

@@ -1,4 +1,4 @@
-use core::{alloc::AllocError, convert::TryInto};
+use core::alloc::AllocError;
 
 use crate::arch::aarch64::mm::paging::{BasePageSize, PageSize};
 use crate::arch::aarch64::mm::{PhysAddr, VirtAddr};

src/arch/aarch64/mm/virtualmem.rs

@@ -1,4 +1,4 @@
-use core::{alloc::AllocError, convert::TryInto};
+use core::alloc::AllocError;
 
 use crate::arch::aarch64::mm::paging::{BasePageSize, PageSize};
 use crate::arch::aarch64::mm::{PhysAddr, VirtAddr};

src/arch/x86_64/kernel/apic.rs

@@ -21,8 +21,6 @@ use alloc::boxed::Box;
 use alloc::vec::Vec;
 use arch::x86_64::kernel::{idt, irq, percore::*, processor, BOOT_INFO};
 use core::arch::x86_64::_mm_mfence;
-#[cfg(feature = "smp")]
-use core::convert::TryInto;
 use core::hint::spin_loop;
 #[cfg(feature = "smp")]
 use core::ptr;

src/arch/x86_64/kernel/mod.rs

@@ -1,5 +1,4 @@
 use alloc::collections::BTreeMap;
-use core::convert::TryInto;
 #[cfg(feature = "newlib")]
 use core::slice;
 use core::{intrinsics, ptr};

src/arch/x86_64/kernel/pci.rs

@@ -10,7 +10,6 @@ use crate::drivers::virtio::transport::pci::VirtioDriver;
 use crate::synch::spinlock::SpinlockIrqSave;
 use crate::x86::io::*;
 use alloc::vec::Vec;
-use core::convert::TryInto;
 use core::{fmt, u32, u8};
 
 // TODO: should these be pub? currently needed since used in virtio.rs maybe use getter methods to be more flexible.

src/arch/x86_64/kernel/processor.rs

@@ -11,7 +11,6 @@ use core::arch::x86_64::{
 	__rdtscp, _fxrstor, _fxsave, _mm_lfence, _rdrand32_step, _rdrand64_step, _rdtsc, _xrstor,
 	_xsave,
 };
-use core::convert::TryInto;
 use core::hint::spin_loop;
 use core::{fmt, u32};
 use qemu_exit::QEMUExit;

src/arch/x86_64/kernel/scheduler.rs

@@ -1,7 +1,6 @@
 //! Architecture dependent interface to initialize a task
 
 use alloc::alloc::{alloc, dealloc, Layout};
-use core::convert::TryInto;
 use core::{mem, ptr};
 
 use crate::arch::x86_64::kernel::apic;

src/arch/x86_64/mm/paging.rs

@@ -1,4 +1,3 @@
-use core::convert::TryInto;
 use core::marker::PhantomData;
 use core::mem;
 use core::ptr;

src/arch/x86_64/mm/physicalmem.rs

@@ -1,5 +1,5 @@
+use core::alloc::AllocError;
 use core::sync::atomic::{AtomicUsize, Ordering};
-use core::{alloc::AllocError, convert::TryInto};
 use multiboot::information::{MemoryType, Multiboot};
 
 use crate::arch::x86_64::kernel::{get_limit, get_mbinfo};

src/arch/x86_64/mm/virtualmem.rs

@@ -1,4 +1,4 @@
-use core::{alloc::AllocError, convert::TryInto};
+use core::alloc::AllocError;
 
 use crate::arch::x86_64::mm::paging::{BasePageSize, PageSize};
 use crate::arch::x86_64::mm::VirtAddr;

src/drivers/net/rtl8139.rs

@@ -2,7 +2,6 @@
 
 #![allow(dead_code)]
 
-use core::convert::TryInto;
 use core::mem;
 
 use crate::arch::kernel::irq::*;

src/drivers/net/virtio_net.rs

@@ -13,7 +13,6 @@ use alloc::boxed::Box;
 use alloc::collections::VecDeque;
 use alloc::rc::Rc;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 use core::mem;
 use core::result::Result;
 use core::{cell::RefCell, cmp::Ordering};

src/drivers/virtio/depr/virtio.rs

@@ -9,7 +9,6 @@ use crate::config::VIRTIO_MAX_QUEUE_SIZE;
 use alloc::boxed::Box;
 use alloc::rc::Rc;
 use alloc::vec::Vec;
-use core::convert::TryInto;
 use core::hint::spin_loop;
 use core::sync::atomic::{fence, Ordering};
 use core::{cell::RefCell, ptr};

src/drivers/virtio/env.rs

@@ -5,7 +5,6 @@
 //! ensure only a single location needs changes, in cases where the underlying kernel code is changed
 
 pub mod memory {
-	use core::convert::TryFrom;
 	use core::ops::Add;
 
 	/// A newtype representing a memory offset which can be used to be added to [PhyMemAddr](PhyMemAddr) or

src/drivers/virtio/transport/pci.rs

@@ -9,7 +9,6 @@ use crate::arch::kernel::pci::{PciAdapter, PciDriver};
 use crate::arch::mm::PhysAddr;
 use crate::synch::spinlock::SpinlockIrqSave;
 use alloc::vec::Vec;
-use core::convert::TryInto;
 use core::mem;
 use core::result::Result;
 

src/drivers/virtio/virtqueue/packed.rs

@@ -16,7 +16,6 @@ use alloc::boxed::Box;
 use alloc::collections::VecDeque;
 use alloc::rc::Rc;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 use core::sync::atomic::{fence, Ordering};
 use core::{cell::RefCell, ptr};
 

src/drivers/virtio/virtqueue/split.rs

@@ -14,7 +14,6 @@ use alloc::boxed::Box;
 use alloc::collections::VecDeque;
 use alloc::rc::Rc;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 use core::sync::atomic::{fence, Ordering};
 use core::{cell::RefCell, ptr};
 

src/scheduler/mod.rs

@@ -3,9 +3,6 @@ use alloc::collections::{BTreeMap, VecDeque};
 use alloc::rc::Rc;
 use alloc::vec::Vec;
 use core::cell::RefCell;
-#[cfg(feature = "smp")]
-use core::convert::TryFrom;
-use core::convert::TryInto;
 use core::sync::atomic::{AtomicU32, Ordering};
 use crossbeam_utils::Backoff;
 

src/scheduler/task.rs

@@ -7,7 +7,6 @@ use alloc::collections::{LinkedList, VecDeque};
 use alloc::rc::Rc;
 use core::cell::RefCell;
 use core::cmp::Ordering;
-use core::convert::TryInto;
 use core::fmt;
 use core::num::NonZeroU64;
 

src/syscalls/interfaces/mod.rs

@@ -1,6 +1,5 @@
 use alloc::boxed::Box;
 use alloc::vec::Vec;
-use core::convert::{TryFrom, TryInto};
 use core::{isize, ptr, slice, str};
 
 use crate::arch;

src/syscalls/processor.rs

@@ -1,5 +1,4 @@
 use crate::arch::get_processor_count;
-use core::convert::TryInto;
 
 extern "C" fn __sys_get_processor_count() -> usize {
 	get_processor_count().try_into().unwrap()