diff options
| author | bors <bors@rust-lang.org> | 2023-02-17 17:42:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-17 17:42:51 +0000 |
| commit | 9aa5c24b7d763fb98d998819571128ff2eb8a3ca (patch) | |
| tree | 8cfe1d86dcc61127aa656f5202c6db2296d07804 /src | |
| parent | f722b24eb9ea35a7cc187a1cb5c50d4d324f5855 (diff) | |
| parent | dce666b797eeba0294ffd253ff5e473bf9f0c3eb (diff) | |
| download | rust-9aa5c24b7d763fb98d998819571128ff2eb8a3ca.tar.gz rust-9aa5c24b7d763fb98d998819571128ff2eb8a3ca.zip | |
Auto merge of #108075 - WaffleLapkin:de-arena-allocates-you-OwO, r=Nilstrieb
Remove `arena_cache` modifier from `associated_item` query & copy `ty::AssocItem` instead of passing by ref r? `@ghost`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index edad773b05e..d2c6e7ab024 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -689,12 +689,12 @@ fn resolve_associated_trait_item<'a>( .find_by_name_and_namespace(cx.tcx, Ident::with_dummy_span(item_name), ns, trait_) .map(|trait_assoc| { trait_assoc_to_impl_assoc_item(cx.tcx, impl_, trait_assoc.def_id) - .unwrap_or(trait_assoc) + .unwrap_or(*trait_assoc) }) }); // FIXME(#74563): warn about ambiguity debug!("the candidates were {:?}", candidates.clone().collect::<Vec<_>>()); - candidates.next().copied() + candidates.next() } /// Find the associated item in the impl `impl_id` that corresponds to the @@ -711,7 +711,7 @@ fn trait_assoc_to_impl_assoc_item<'tcx>( tcx: TyCtxt<'tcx>, impl_id: DefId, trait_assoc_id: DefId, -) -> Option<&'tcx ty::AssocItem> { +) -> Option<ty::AssocItem> { let trait_to_impl_assoc_map = tcx.impl_item_implementor_ids(impl_id); debug!(?trait_to_impl_assoc_map); let impl_assoc_id = *trait_to_impl_assoc_map.get(&trait_assoc_id)?; |
