Merge #39

39: Migrate from core-intrinsics to core::ptr r=mkroening a=mkroening bors r+ Co-authored-by: Martin Kröning <[email protected]>
hermit-os · Sep 26, 2021 · 6605efc · 6605efc
2 parents 7bdadcc + c389741
commit 6605efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
@@ -14,7 +14,7 @@ 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::intrinsics::copy;
+use core::ptr::copy;
 use core::{mem, slice};
 use goblin::elf;
 use multiboot::information::{MemoryManagement, Multiboot, PAddr};

diff --git a/src/lib.rs b/src/lib.rs
@@ -24,8 +24,7 @@ extern crate bitflags;
 use crate::arch::x86_64::paging::{LargePageSize, PageSize};
 use crate::arch::{get_memory, BOOT_INFO, ELF_ARCH};
 use core::convert::TryInto;
-use core::intrinsics::{copy_nonoverlapping, write_bytes};
-use core::ptr;
+use core::ptr::{self, copy_nonoverlapping, write_bytes};
 use goblin::elf;
 use goblin::elf::program_header::{PT_LOAD, PT_TLS};
 use goblin::elf64::reloc::*;