diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-12-15 15:13:19 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-12-15 15:13:19 +1100 |
| commit | 5258b655a233f48960e8b4430c94c00b928e8b71 (patch) | |
| tree | fc1d66bb562ea194dc8806e862f3d4f49666825a /src/librustdoc/clean | |
| parent | 2a5aabdfc2c44112da2fd98661e03c559e057731 (diff) | |
| download | rust-5258b655a233f48960e8b4430c94c00b928e8b71.tar.gz rust-5258b655a233f48960e8b4430c94c00b928e8b71.zip | |
Merge `SimplifiedTypeGen<D>` into `SimplifiedType`.
`SimplifiedTypeGen<DefId>` is the only instantiation used, so we don't need the generic parameter.
Diffstat (limited to 'src/librustdoc/clean')
| -rw-r--r-- | src/librustdoc/clean/inline.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/clean/types.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index e7c3e5a45e8..2d829779f15 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -325,7 +325,7 @@ pub(crate) fn build_impls( // * https://github.com/rust-lang/rust/pull/99917 — where the feature got used // * https://github.com/rust-lang/rust/issues/53487 — overall tracking issue for Error if tcx.has_attr(did, sym::rustc_has_incoherent_inherent_impls) { - use rustc_middle::ty::fast_reject::SimplifiedTypeGen::*; + use rustc_middle::ty::fast_reject::SimplifiedType::*; let type_ = if tcx.is_trait(did) { TraitSimplifiedType(did) } else { AdtSimplifiedType(did) }; for &did in tcx.incoherent_impls(type_) { diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 98329e7fc91..2c7692e8655 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -1870,7 +1870,7 @@ impl PrimitiveType { } pub(crate) fn simplified_types() -> &'static SimplifiedTypes { - use ty::fast_reject::SimplifiedTypeGen::*; + use ty::fast_reject::SimplifiedType::*; use ty::{FloatTy, IntTy, UintTy}; use PrimitiveType::*; static CELL: OnceCell<SimplifiedTypes> = OnceCell::new(); |
