rustdoc: Cleanup ABI rendering

Use a common method for rendering `extern "<abi>"`.

This now consistently shows `extern "C" fn` rather than just `extern fn`.
This commit is contained in:
Oliver Middleton
2016-04-22 11:48:46 +01:00
parent 887e947178
commit 2b1e35ec12
7 changed files with 48 additions and 21 deletions

View File

@@ -451,11 +451,7 @@ impl fmt::Display for clean::Type {
clean::BareFunction(ref decl) => {
write!(f, "{}{}fn{}{}",
UnsafetySpace(decl.unsafety),
match &*decl.abi {
"" => " extern ".to_string(),
"\"Rust\"" => "".to_string(),
s => format!(" extern {} ", s)
},
AbiSpace(decl.abi),
decl.generics,
decl.decl)
}
@@ -770,8 +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),
abi => write!(f, "extern &quot;{}&quot; ", abi.name()),
}
}
}