Auto merge of #35236 - nrc:rustdoc-redirects, r=@alexcrichton

[rust.git] / src / librustdoc / html / format.rs

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 8802bc6dc42e039e2875fabb84b6a5a5ca66449b..f8b852074dd2b1a3180107e1c8523de9cb7eb6db 100644 (file)
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -492,7 +492,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 primitive_link(f, clean::PrimitiveType::Array,
                                &format!("; {}]", Escape(s)))
             }
-            clean::Bottom => f.write_str("!"),
+            clean::Never => f.write_str("!"),
             clean::RawPointer(m, ref t) => {
                 match **t {
                     clean::Generic(_) | clean::ResolvedPath {is_generic: true, ..} => {
@@ -634,7 +634,6 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             clean::Return(clean::Tuple(ref tys)) if tys.is_empty() => Ok(()),
             clean::Return(ref ty) => write!(f, " -> {}", ty),
             clean::DefaultReturn => Ok(()),
-            clean::NoReturn => write!(f, " -> !")
         }
     }
 }