From 59dd15f603792046d0fc333f7e65394abc4bb037 Mon Sep 17 00:00:00 2001
From: Denys Zariaiev <denys.zariaiev@gmail.com>
Date: Mon, 25 Feb 2019 17:20:49 +0100
Subject: [PATCH] Correctly import `core::ffi::c_void`

---
 library/stdarch/crates/core_arch/src/lib.rs       | 2 +-
 library/stdarch/crates/core_arch/src/nvptx/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/stdarch/crates/core_arch/src/lib.rs b/library/stdarch/crates/core_arch/src/lib.rs
index 4f35579fd80f..fb621808b60b 100644
--- a/library/stdarch/crates/core_arch/src/lib.rs
+++ b/library/stdarch/crates/core_arch/src/lib.rs
@@ -83,4 +83,4 @@ mod core_arch;
 pub use self::core_arch::arch::*;
 
 #[allow(unused_imports)]
-use core::{intrinsics, marker, mem, ptr, sync};
+use core::{ffi, intrinsics, marker, mem, ptr, sync};
diff --git a/library/stdarch/crates/core_arch/src/nvptx/mod.rs b/library/stdarch/crates/core_arch/src/nvptx/mod.rs
index 30df583c5708..bf6673f4788e 100644
--- a/library/stdarch/crates/core_arch/src/nvptx/mod.rs
+++ b/library/stdarch/crates/core_arch/src/nvptx/mod.rs
@@ -11,7 +11,7 @@
 //! [llvm_docs]:
 //! https://llvm.org/docs/NVPTXUsage.html
 
-use core::ffi::c_void;
+use crate::ffi::c_void;
 
 #[allow(improper_ctypes)]
 extern "C" {