Skip to content

Commit

Permalink
Rust 2021: Remove new prelude uses
Browse files Browse the repository at this point in the history
  • Loading branch information
mkroening committed Nov 6, 2021
1 parent a3379e8 commit bac47b9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion src/arch/x86_64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions src/kernel.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down

0 comments on commit bac47b9

Please # to comment.