Skip to content

Commit 20ed971

Browse files
Improve code a bit
1 parent c7491b9 commit 20ed971

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

src/librustdoc/clean/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,22 +3002,22 @@ fn clean_use_statement_inner<'tcx>(
30023002
// were specifically asked for it
30033003
denied = true;
30043004
}
3005-
if !denied {
3006-
if let Some(mut items) = inline::try_inline(
3005+
if !denied
3006+
&& let Some(mut items) = inline::try_inline(
30073007
cx,
30083008
path.res,
30093009
name,
30103010
Some((attrs, Some(import_def_id))),
30113011
&mut Default::default(),
3012-
) {
3013-
items.push(Item::from_def_id_and_parts(
3014-
import_def_id,
3015-
None,
3016-
ImportItem(Import::new_simple(name, resolve_use_source(cx, path), false)),
3017-
cx,
3018-
));
3019-
return items;
3020-
}
3012+
)
3013+
{
3014+
items.push(Item::from_def_id_and_parts(
3015+
import_def_id,
3016+
None,
3017+
ImportItem(Import::new_simple(name, resolve_use_source(cx, path), false)),
3018+
cx,
3019+
));
3020+
return items;
30213021
}
30223022
Import::new_simple(name, resolve_use_source(cx, path), true)
30233023
};

src/librustdoc/formats/cache.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ impl Cache {
203203
impl<'a, 'tcx> DocFolder for CacheBuilder<'a, 'tcx> {
204204
fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
205205
if item.item_id.is_local() {
206-
let is_stripped = matches!(*item.kind, clean::ItemKind::StrippedItem(..));
207206
debug!(
208-
"folding {} (stripped: {is_stripped:?}) \"{:?}\", id {:?}",
207+
"folding {} (stripped: {:?}) \"{:?}\", id {:?}",
209208
item.type_(),
209+
item.is_stripped(),
210210
item.name,
211211
item.item_id
212212
);
@@ -246,13 +246,11 @@ impl<'a, 'tcx> DocFolder for CacheBuilder<'a, 'tcx> {
246246
// trait.
247247
if let clean::TraitItem(ref t) = *item.kind {
248248
self.cache.traits.entry(item.item_id.expect_def_id()).or_insert_with(|| (**t).clone());
249-
}
250-
251-
// Collect all the implementors of traits.
252-
if let clean::ImplItem(ref i) = *item.kind
249+
} else if let clean::ImplItem(ref i) = *item.kind
253250
&& let Some(trait_) = &i.trait_
254251
&& !i.kind.is_blanket()
255252
{
253+
// Collect all the implementors of traits.
256254
self.cache
257255
.implementors
258256
.entry(trait_.def_id())

0 commit comments

Comments
 (0)