rustdoc: Render extern fn instead of extern "C" fn

ollie27 · ollie27 · commit 48aabbd9e3a4 · 2016-04-27T18:43:51.000+01:00
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
@@ -766,6 +766,7 @@ impl fmt::Display for AbiSpace {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.0 {
             Abi::Rust => Ok(()),
+            Abi::C => write!(f, "extern "),
             abi => write!(f, "extern &quot;{}&quot; ", abi.name()),
         }
     }
diff --git a/src/test/rustdoc/extern-impl.rs b/src/test/rustdoc/extern-impl.rs
@@ -18,9 +18,9 @@ impl Foo {
     pub fn rust0() {}
     // @has - '//code' 'fn rust1()'
     pub extern "Rust" fn rust1() {}
-    // @has - '//code' 'extern "C" fn c0()'
+    // @has - '//code' 'extern fn c0()'
     pub extern fn c0() {}
-    // @has - '//code' 'extern "C" fn c1()'
+    // @has - '//code' 'extern fn c1()'
     pub extern "C" fn c1() {}
     // @has - '//code' 'extern "system" fn system0()'
     pub extern "system" fn system0() {}
@@ -31,7 +31,7 @@ pub trait Bar {}
 
 // @has - '//code' 'impl Bar for fn()'
 impl Bar for fn() {}
-// @has - '//code' 'impl Bar for extern "C" fn()'
+// @has - '//code' 'impl Bar for extern fn()'
 impl Bar for extern fn() {}
 // @has - '//code' 'impl Bar for extern "system" fn()'
 impl Bar for extern "system" fn() {}
diff --git a/src/test/rustdoc/ffi.rs b/src/test/rustdoc/ffi.rs
@@ -13,10 +13,10 @@
 
 extern crate rustdoc_ffi as lib;
 
-// @has ffi/fn.foreigner.html //pre 'pub unsafe extern "C" fn foreigner(cold_as_ice: u32)'
+// @has ffi/fn.foreigner.html //pre 'pub unsafe extern fn foreigner(cold_as_ice: u32)'
 pub use lib::foreigner;
 
 extern "C" {
-    // @has ffi/fn.another.html //pre 'pub unsafe extern "C" fn another(cold_as_ice: u32)'
+    // @has ffi/fn.another.html //pre 'pub unsafe extern fn another(cold_as_ice: u32)'
     pub fn another(cold_as_ice: u32);
 }
diff --git a/src/test/rustdoc/issue-22038.rs b/src/test/rustdoc/issue-22038.rs
@@ -10,7 +10,7 @@
 
 extern {
     // @has issue_22038/fn.foo1.html \
-    //      '//*[@class="rust fn"]' 'pub unsafe extern "C" fn foo1()'
+    //      '//*[@class="rust fn"]' 'pub unsafe extern fn foo1()'
     pub fn foo1();
 }
 
@@ -21,7 +21,7 @@ extern "system" {
 }
 
 // @has issue_22038/fn.bar.html \
-//      '//*[@class="rust fn"]' 'pub extern "C" fn bar()'
+//      '//*[@class="rust fn"]' 'pub extern fn bar()'
 pub extern fn bar() {}
 
 // @has issue_22038/fn.baz.html \
diff --git a/src/test/rustdoc/variadic.rs b/src/test/rustdoc/variadic.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 extern "C" {
-    // @has variadic/fn.foo.html //pre 'pub unsafe extern "C" fn foo(x: i32, ...)'
+    // @has variadic/fn.foo.html //pre 'pub unsafe extern fn foo(x: i32, ...)'
     pub fn foo(x: i32, ...);
 }

Original file line number	Diff line number	Diff line change
`@@ -766,6 +766,7 @@ impl fmt::Display for AbiSpace {`
`766`	`766`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`767`	`767`	`match self.0 {`
`768`	`768`	`Abi::Rust => Ok(()),`
	`769`	`+ Abi::C => write!(f, "extern "),`
`769`	`770`	`abi => write!(f, "extern "{}" ", abi.name()),`
`770`	`771`	`}`
`771`	`772`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`extern {`
`12`	`12`	`// @has issue_22038/fn.foo1.html \`
`13`		`- // '//*[@class="rust fn"]' 'pub unsafe extern "C" fn foo1()'`
	`13`	`+ // '//*[@class="rust fn"]' 'pub unsafe extern fn foo1()'`
`14`	`14`	`pub fn foo1();`
`15`	`15`	`}`
`16`	`16`
`@@ -21,7 +21,7 @@ extern "system" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`// @has issue_22038/fn.bar.html \`
`24`		`-// '//*[@class="rust fn"]' 'pub extern "C" fn bar()'`
	`24`	`+// '//*[@class="rust fn"]' 'pub extern fn bar()'`
`25`	`25`	`pub extern fn bar() {}`
`26`	`26`
`27`	`27`	`// @has issue_22038/fn.baz.html \`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`// except according to those terms.`
`10`	`10`
`11`	`11`	`extern "C" {`
`12`		`- // @has variadic/fn.foo.html //pre 'pub unsafe extern "C" fn foo(x: i32, ...)'`
	`12`	`+ // @has variadic/fn.foo.html //pre 'pub unsafe extern fn foo(x: i32, ...)'`
`13`	`13`	`pub fn foo(x: i32, ...);`
`14`	`14`	`}`