about summary refs log tree commit diff
path: root/src/librustdoc/json
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2021-09-29 19:33:38 -0700
committerGitHub <noreply@github.com>2021-09-29 19:33:38 -0700
commit8dfe52293a61aaa4ff44b20d538c52ddc7834617 (patch)
treef69acb7035f51c78d1949698414ae614d4cdae5e /src/librustdoc/json
parent9050c541c51bbb04ce19bcbc2b428fb00b8e0865 (diff)
parentbdd34717b86c2a6ab84d21764dc12e00a431d154 (diff)
downloadrust-8dfe52293a61aaa4ff44b20d538c52ddc7834617.tar.gz
rust-8dfe52293a61aaa4ff44b20d538c52ddc7834617.zip
Rollup merge of #89297 - GuillaumeGomez:remove-never-from-type-enum, r=camelid
Remove Never variant from clean::Type enum

Fixes #89287.

r? ``@camelid``
Diffstat (limited to 'src/librustdoc/json')
-rw-r--r--src/librustdoc/json/conversions.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index fda90703057..ea81b041c3b 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -417,13 +417,13 @@ impl FromWithTcx<clean::Type> for Type {
                 }
             }
             Generic(s) => Type::Generic(s.to_string()),
+            Primitive(clean::PrimitiveType::Never) => Type::Never,
             Primitive(p) => Type::Primitive(p.as_sym().to_string()),
             BareFunction(f) => Type::FunctionPointer(Box::new((*f).into_tcx(tcx))),
             Tuple(t) => Type::Tuple(t.into_iter().map(|x| x.into_tcx(tcx)).collect()),
             Slice(t) => Type::Slice(Box::new((*t).into_tcx(tcx))),
             Array(t, s) => Type::Array { type_: Box::new((*t).into_tcx(tcx)), len: s },
             ImplTrait(g) => Type::ImplTrait(g.into_iter().map(|x| x.into_tcx(tcx)).collect()),
-            Never => Type::Never,
             Infer => Type::Infer,
             RawPointer(mutability, type_) => Type::RawPointer {
                 mutable: mutability == ast::Mutability::Mut,