File tree Expand file tree Collapse file tree 5 files changed +12
-23
lines changed Expand file tree Collapse file tree 5 files changed +12
-23
lines changed Original file line number Diff line number Diff line change @@ -248,7 +248,6 @@ impl<'a> Item<'a> {
248248 abi : format_extern (
249249 ast:: Extern :: from_abi ( fm. abi , DUMMY_SP ) ,
250250 config. force_explicit_abi ( ) ,
251- true ,
252251 ) ,
253252 vis : None ,
254253 body : fm
@@ -338,7 +337,6 @@ impl<'a> FnSig<'a> {
338337 result. push_str ( & format_extern (
339338 self . ext ,
340339 context. config . force_explicit_abi ( ) ,
341- false ,
342340 ) ) ;
343341 result
344342 }
Original file line number Diff line number Diff line change @@ -896,7 +896,6 @@ fn rewrite_bare_fn(
896896 result. push_str ( & format_extern (
897897 bare_fn. ext ,
898898 context. config . force_explicit_abi ( ) ,
899- false ,
900899 ) ) ;
901900
902901 result. push_str ( "fn" ) ;
Original file line number Diff line number Diff line change @@ -131,23 +131,14 @@ pub(crate) fn format_mutability(mutability: ast::Mutability) -> &'static str {
131131}
132132
133133#[ inline]
134- pub ( crate ) fn format_extern (
135- ext : ast:: Extern ,
136- explicit_abi : bool ,
137- is_mod : bool ,
138- ) -> Cow < ' static , str > {
139- let abi = match ext {
140- ast:: Extern :: None => "Rust" . to_owned ( ) ,
141- ast:: Extern :: Implicit ( _) => "C" . to_owned ( ) ,
142- ast:: Extern :: Explicit ( abi, _) => abi. symbol_unescaped . to_string ( ) ,
143- } ;
144-
145- if abi == "Rust" && !is_mod {
146- Cow :: from ( "" )
147- } else if abi == "C" && !explicit_abi {
148- Cow :: from ( "extern " )
149- } else {
150- Cow :: from ( format ! ( r#"extern "{}" "# , abi) )
134+ pub ( crate ) fn format_extern ( ext : ast:: Extern , force_explicit_abi : bool ) -> Cow < ' static , str > {
135+ match ext {
136+ ast:: Extern :: None => Cow :: from ( "" ) ,
137+ ast:: Extern :: Implicit ( _) if force_explicit_abi => Cow :: from ( "extern \" C\" " ) ,
138+ ast:: Extern :: Implicit ( _) => Cow :: from ( "extern " ) ,
139+ ast:: Extern :: Explicit ( abi, _) => {
140+ Cow :: from ( format ! ( r#"extern "{}" "# , abi. symbol_unescaped) )
141+ }
151142 }
152143}
153144
Original file line number Diff line number Diff line change 1+ extern "Rust" fn uwu ( ) { }
Original file line number Diff line number Diff line change 11// rustfmt-force_explicit_abi: false
22
3- extern {
3+ extern "C" {
44 fn some_fn ( ) -> ( ) ;
55}
66
7- extern fn sup ( ) { }
7+ extern "C" fn sup ( ) { }
88
9- type funky_func = extern fn (
9+ type funky_func = extern "C" fn (
1010 unsafe extern "rust-call" fn (
1111 * const JSJitInfo ,
1212 * mut JSContext ,
You can’t perform that action at this time.
0 commit comments