about summary refs log tree commit diff
path: root/src/librustdoc/html/format.rs
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2016-04-22 11:48:46 +0100
committerOliver Middleton <olliemail27@gmail.com>2016-04-22 11:51:25 +0100
commit2b1e35ec129b53bc440b59ede8bfaccb88a3cbf4 (patch)
tree53affdf3d5596d72cb9a57b4b4b4a591810cbba2 /src/librustdoc/html/format.rs
parent887e9471783ff3f5edc920a85b6110486dc063c0 (diff)
downloadrust-2b1e35ec129b53bc440b59ede8bfaccb88a3cbf4.tar.gz
rust-2b1e35ec129b53bc440b59ede8bfaccb88a3cbf4.zip
rustdoc: Cleanup ABI rendering
Use a common method for rendering `extern "<abi>"`.

This now consistently shows `extern "C" fn` rather than just `extern fn`.
Diffstat (limited to 'src/librustdoc/html/format.rs')
-rw-r--r--src/librustdoc/html/format.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index d4212bba590..72414ad4c5e 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -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()),
         }
     }
 }