user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't clone new_item in after_krate.

Browse source 
We can avoid it by using the `entry` API, which lets us do the
`assert_eq` comparison before `new_item` is consumed.
This commit is contained in:
Nicholas Nethercote 2025-06-11 12:54:19 +10:00
parent 79b3c08bdb
commit 278f4b2d9c
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/librustdoc/json/mod.rs
View file

@ -217,6 +217,8 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
/// the hashmap because certain items (traits and types) need to have their mappings for trait
/// implementations filled out before they're inserted.
fn item(&mut self, item: &clean::Item) -> Result<(), Error> {
use std::collections::hash_map::Entry;
let item_type = item.type_();
let item_name = item.name;
trace!("rendering {item_type} {item_name:?}");
@ -271,18 +273,25 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
| types::ItemEnum::Macro(_)
| types::ItemEnum::ProcMacro(_) => false,
};
let removed = self.index.insert(new_item.id, new_item.clone());
// FIXME(adotinthevoid): Currently, the index is duplicated. This is a sanity check
// to make sure the items are unique. The main place this happens is when an item, is
// reexported in more than one place. See `rustdoc-json/reexport/in_root_and_mod`
if let Some(old_item) = removed {
// In case of generic implementations (like `impl<T> Trait for T {}`), all the
// inner items will be duplicated so we can ignore if they are slightly different.
if !can_be_ignored {
assert_eq!(old_item, new_item);
match self.index.entry(new_item.id) {
Entry::Vacant(entry) => {
entry.insert(new_item);
}
Entry::Occupied(mut entry) => {
// In case of generic implementations (like `impl<T> Trait for T {}`), all the
// inner items will be duplicated so we can ignore if they are slightly
// different.
let old_item = entry.get_mut();
if !can_be_ignored {
assert_eq!(*old_item, new_item);
}
trace!("replaced {old_item:?}\nwith {new_item:?}");
*old_item = new_item;
}
trace!("replaced {old_item:?}\nwith {new_item:?}");
}
}