diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-09-27 14:20:52 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-09-29 20:29:33 +0200 |
| commit | bdd34717b86c2a6ab84d21764dc12e00a431d154 (patch) | |
| tree | d77c4f955bdfab239a2d39f66468b48e28073c4e /src/librustdoc/clean | |
| parent | 6df1d82869d06b88ff413e63a1e8efbb311e3b5c (diff) | |
| download | rust-bdd34717b86c2a6ab84d21764dc12e00a431d154.tar.gz rust-bdd34717b86c2a6ab84d21764dc12e00a431d154.zip | |
Remove Never variant from clean::Type enum
Diffstat (limited to 'src/librustdoc/clean')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/clean/types.rs | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 611a4d08ab2..49fc93f3fea 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1313,7 +1313,7 @@ impl Clean<Type> for hir::Ty<'_> { use rustc_hir::*; match self.kind { - TyKind::Never => Never, + TyKind::Never => Primitive(PrimitiveType::Never), TyKind::Ptr(ref m) => RawPointer(m.mutbl, box m.ty.clean(cx)), TyKind::Rptr(ref l, ref m) => { // There are two times a `Fresh` lifetime can be created: @@ -1402,7 +1402,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> { trace!("cleaning type: {:?}", self); let ty = normalize(cx, self).unwrap_or(self); match *ty.kind() { - ty::Never => Never, + ty::Never => Primitive(PrimitiveType::Never), ty::Bool => Primitive(PrimitiveType::Bool), ty::Char => Primitive(PrimitiveType::Char), ty::Int(int_ty) => Primitive(int_ty.into()), diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 68a35e55c26..248ff339514 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -1396,7 +1396,6 @@ crate enum Type { Slice(Box<Type>), /// The `String` field is about the size or the constant representing the array's length. Array(Box<Type>, String), - Never, RawPointer(Mutability, Box<Type>), BorrowedRef { lifetime: Option<Lifetime>, @@ -1462,7 +1461,6 @@ impl Type { } RawPointer(..) => Some(PrimitiveType::RawPointer), BareFunction(..) => Some(PrimitiveType::Fn), - Never => Some(PrimitiveType::Never), _ => None, } } @@ -1550,7 +1548,6 @@ impl Type { } } BareFunction(..) => PrimitiveType::Fn, - Never => PrimitiveType::Never, Slice(..) => PrimitiveType::Slice, Array(..) => PrimitiveType::Array, RawPointer(..) => PrimitiveType::RawPointer, |