From c389741ece517431d50924cbaa7f943153775e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Sun, 26 Sep 2021 19:52:22 +0200
Subject: [PATCH] Migrate from core-intrinsics to core::ptr

---
 src/arch/x86_64/mod.rs | 2 +-
 src/lib.rs             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
index 4d56c92e..c64f3895 100644
--- 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
index 6447deb4..5cb8f990 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,8 +28,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::*;