user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Oliver Middleton 2016-04-27 18:43:51 +01:00
parent 2b1e35ec12
commit 48aabbd9e3
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/librustdoc/html/format.rs
View file

@ -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 "{}" ", abi.name()),
}
}

6
src/test/rustdoc/extern-impl.rs
View file

@ -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() {}

4
src/test/rustdoc/ffi.rs
View file

@ -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);
}

4
src/test/rustdoc/issue-22038.rs
View file

@ -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 \

2
src/test/rustdoc/variadic.rs
View file

@ -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, ...);
}