bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove Crate::primitives field

Browse source
This commit is contained in:
Guillaume Gomez 2022-11-27 16:31:34 +01:00
parent 4e0d0d757e
commit 5856e40885
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustdoc/clean/types.rs
View file

@ -115,7 +115,6 @@ impl From<DefId> for ItemId {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub(crate) struct Crate { pub(crate) struct Crate {
pub(crate) module: Item, pub(crate) module: Item,
pub(crate) primitives: ThinVec<(DefId, PrimitiveType)>,
/// Only here so that they can be filtered through the rustdoc passes. /// Only here so that they can be filtered through the rustdoc passes.
pub(crate) external_traits: Rc<RefCell<FxHashMap<DefId, Trait>>>, pub(crate) external_traits: Rc<RefCell<FxHashMap<DefId, Trait>>>,
} }
@ -2572,7 +2571,7 @@ mod size_asserts {
use super::*; use super::*;
use rustc_data_structures::static_assert_size; use rustc_data_structures::static_assert_size;
// tidy-alphabetical-start // tidy-alphabetical-start
static_assert_size!(Crate, 72); // frequently moved by-value static_assert_size!(Crate, 64); // frequently moved by-value
static_assert_size!(DocFragment, 32); static_assert_size!(DocFragment, 32);
static_assert_size!(GenericArg, 32); static_assert_size!(GenericArg, 32);
static_assert_size!(GenericArgs, 32); static_assert_size!(GenericArgs, 32);

2
src/librustdoc/clean/utils.rs
View file

@ -73,7 +73,7 @@ pub(crate) fn krate(cx: &mut DocContext<'_>) -> Crate {
})); }));
} }
Crate { module, primitives, external_traits: cx.external_traits.clone() } Crate { module, external_traits: cx.external_traits.clone() }
} }
pub(crate) fn substs_to_args<'tcx>( pub(crate) fn substs_to_args<'tcx>(

6
src/librustdoc/passes/collect_trait_impls.rs
View file

@ -8,7 +8,7 @@ use crate::formats::cache::Cache;
use crate::visit::DocVisitor; use crate::visit::DocVisitor;
use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_hir::def_id::DefId; use rustc_hir::def_id::{DefId, LOCAL_CRATE};
use rustc_middle::ty::{self, DefIdTree}; use rustc_middle::ty::{self, DefIdTree};
use rustc_span::symbol::sym; use rustc_span::symbol::sym;
@ -25,7 +25,9 @@ pub(crate) fn collect_trait_impls(mut krate: Crate, cx: &mut DocContext<'_>) ->
synth.impls synth.impls
}); });
let prims: FxHashSet<PrimitiveType> = krate.primitives.iter().map(|p| p.1).collect(); let local_crate = ExternalCrate { crate_num: LOCAL_CRATE };
let prims: FxHashSet<PrimitiveType> =
local_crate.primitives(cx.tcx).iter().map(|p| p.1).collect();
let crate_items = { let crate_items = {
let mut coll = ItemCollector::new(); let mut coll = ItemCollector::new();