nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #101830 - nnethercote:streamline-register_res, r=jyn514

Browse Source 
Streamline `register_res`.

Turns out it's only ever passed a `Res::Def`.

r? `@jyn514`
This commit is contained in:
bors 2022-09-15 02:58:21 +00:00
commit c3f59295fe
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/librustdoc/clean/utils.rs
View File

@ -491,30 +491,14 @@ pub(crate) fn register_res(cx: &mut DocContext<'_>, res: Res) -> DefId {
use DefKind::*;
debug!("register_res({:?})", res);
let (did, kind) = match res {
// These should be added to the cache using `record_extern_fqn`.
let (kind, did) = match res {
Res::Def(
kind @ (AssocTy | AssocFn | AssocConst | Variant | Fn | TyAlias | Enum | Trait | Struct
| Union | Mod | ForeignTy | Const | Static(_) | Macro(..) | TraitAlias),
i,
) => (i, kind.into()),
// This is part of a trait definition or trait impl; document the trait.
Res::SelfTy { trait_: Some(trait_def_id), alias_to: _ } => (trait_def_id, ItemType::Trait),
// This is an inherent impl or a type definition; it doesn't have its own page.
Res::SelfTy { trait_: None, alias_to: Some((item_def_id, _)) } => return item_def_id,
Res::SelfTy { trait_: None, alias_to: None }
| Res::PrimTy(_)
| Res::ToolMod
| Res::SelfCtor(_)
| Res::Local(_)
| Res::NonMacroAttr(_)
| Res::Err => return res.def_id(),
Res::Def(
TyParam | ConstParam | Ctor(..) | ExternCrate | Use | ForeignMod | AnonConst
| InlineConst | OpaqueTy | ImplTraitPlaceholder | Field | LifetimeParam | GlobalAsm
| Impl | Closure | Generator,
id,
) => return id,
did,
) => (kind.into(), did),
_ => panic!("register_res: unexpected {:?}", res),
};
if did.is_local() {
return did;