Skip to content

Commit e7d30cb

Browse files
authored
Merge pull request #489 from dtolnay/rustfmt
No longer need rustfmt::skip when using extern type alias
2 parents 80ef068 + b2bf244 commit e7d30cb

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

tests/ffi/extra.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// for testing aliasing between cxx::bridge mods, so we'll keep it that way and
66
// start a new mod here.
77

8-
// Rustfmt mangles the extern type alias.
9-
// https://github.com/rust-lang/rustfmt/issues/4159
10-
#[rustfmt::skip]
118
#[cxx::bridge(namespace = "tests")]
129
pub mod ffi2 {
1310
impl UniquePtr<D> {}
@@ -43,7 +40,7 @@ pub mod ffi2 {
4340
fn c_return_trivial_ns_ptr() -> UniquePtr<G>;
4441
fn c_return_trivial_ns() -> G;
4542
fn c_return_opaque_ptr() -> UniquePtr<E>;
46-
fn c_return_ns_opaque_ptr() -> UniquePtr<F>;
43+
fn c_return_ns_opaque_ptr() -> UniquePtr<F>;
4744
fn c_return_ns_unique_ptr() -> UniquePtr<H>;
4845
fn c_take_ref_ns_c(h: &H);
4946

tests/ffi/module.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Rustfmt mangles the extern type alias.
2-
// https://github.com/rust-lang/rustfmt/issues/4159
3-
#[rustfmt::skip]
41
#[cxx::bridge(namespace = "tests")]
52
pub mod ffi {
63
unsafe extern "C++" {

0 commit comments

Comments
 (0)