From 4b67506baa758d6937c765a9d99ca803dce2c5bd Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 25 Mar 2022 16:12:57 +0100
Subject: [PATCH] Remove usage of extern_types feature gate

---
 library/proc_macro/src/bridge/closure.rs | 15 ++++++++-------
 library/proc_macro/src/lib.rs            |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/proc_macro/src/bridge/closure.rs b/library/proc_macro/src/bridge/closure.rs
index 5bfe287d33ab..04d30d82bd11 100644
--- a/library/proc_macro/src/bridge/closure.rs
+++ b/library/proc_macro/src/bridge/closure.rs
@@ -1,24 +1,25 @@
 //! Closure type (equivalent to `&mut dyn FnMut(A) -> R`) that's `repr(C)`.
 
+use std::marker::PhantomData;
+
 #[repr(C)]
 pub struct Closure<'a, A, R> {
-    call: unsafe extern "C" fn(&mut Env, A) -> R,
-    env: &'a mut Env,
+    call: unsafe extern "C" fn(*mut Env, A) -> R,
+    env: *mut Env,
+    _marker: PhantomData<&'a mut ()>,
 }
 
-extern "C" {
-    type Env;
-}
+struct Env;
 
 impl<'a, A, R> !Sync for Closure<'a, A, R> {}
 impl<'a, A, R> !Send for Closure<'a, A, R> {}
 
 impl<'a, A, R, F: FnMut(A) -> R> From<&'a mut F> for Closure<'a, A, R> {
     fn from(f: &'a mut F) -> Self {
-        unsafe extern "C" fn call<A, R, F: FnMut(A) -> R>(env: &mut Env, arg: A) -> R {
+        unsafe extern "C" fn call<A, R, F: FnMut(A) -> R>(env: *mut Env, arg: A) -> R {
             (*(env as *mut _ as *mut F))(arg)
         }
-        Closure { call: call::<A, R, F>, env: unsafe { &mut *(f as *mut _ as *mut Env) } }
+        Closure { call: call::<A, R, F>, env: f as *mut _ as *mut Env, _marker: PhantomData }
     }
 }
 
diff --git a/library/proc_macro/src/lib.rs b/library/proc_macro/src/lib.rs
index 088d32ed16f9..433fb1001dd7 100644
--- a/library/proc_macro/src/lib.rs
+++ b/library/proc_macro/src/lib.rs
@@ -24,7 +24,6 @@
 #![cfg_attr(bootstrap, feature(const_fn_fn_ptr_basics))]
 #![feature(allow_internal_unstable)]
 #![feature(decl_macro)]
-#![feature(extern_types)]
 #![feature(negative_impls)]
 #![feature(restricted_std)]
 #![feature(rustc_attrs)]