From b2bf244a90feeccc764335c568577ff239fa7ff5 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 19 Nov 2020 14:00:38 -0800
Subject: [PATCH] No longer need rustfmt::skip when using extern type alias

---
 tests/ffi/extra.rs  | 5 +----
 tests/ffi/module.rs | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/ffi/extra.rs b/tests/ffi/extra.rs
index 8ca5e57ad..51d21ccdd 100644
--- a/tests/ffi/extra.rs
+++ b/tests/ffi/extra.rs
@@ -5,9 +5,6 @@
 // for testing aliasing between cxx::bridge mods, so we'll keep it that way and
 // start a new mod here.
 
-// Rustfmt mangles the extern type alias.
-// https://github.com/rust-lang/rustfmt/issues/4159
-#[rustfmt::skip]
 #[cxx::bridge(namespace = "tests")]
 pub mod ffi2 {
     impl UniquePtr<D> {}
@@ -43,7 +40,7 @@ pub mod ffi2 {
         fn c_return_trivial_ns_ptr() -> UniquePtr<G>;
         fn c_return_trivial_ns() -> G;
         fn c_return_opaque_ptr() -> UniquePtr<E>;
-        fn c_return_ns_opaque_ptr() -> UniquePtr<F>;  
+        fn c_return_ns_opaque_ptr() -> UniquePtr<F>;
         fn c_return_ns_unique_ptr() -> UniquePtr<H>;
         fn c_take_ref_ns_c(h: &H);
 
diff --git a/tests/ffi/module.rs b/tests/ffi/module.rs
index aff1b1c5d..19528859e 100644
--- a/tests/ffi/module.rs
+++ b/tests/ffi/module.rs
@@ -1,6 +1,3 @@
-// Rustfmt mangles the extern type alias.
-// https://github.com/rust-lang/rustfmt/issues/4159
-#[rustfmt::skip]
 #[cxx::bridge(namespace = "tests")]
 pub mod ffi {
     unsafe extern "C++" {