summaryrefslogtreecommitdiffstats
path: root/src/librustdoc/json
diff options
context:
space:
mode:
Diffstat (limited to 'src/librustdoc/json')
-rw-r--r--src/librustdoc/json/conversions.rs15
-rw-r--r--src/librustdoc/json/mod.rs6
2 files changed, 11 insertions, 10 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index 285923251..61376ab31 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -250,15 +250,16 @@ pub(crate) fn id_from_item_inner(
// their parent module, which isn't present in the output JSON items. So
// instead, we directly get the primitive symbol and convert it to u32 to
// generate the ID.
- if matches!(tcx.def_kind(def_id), DefKind::Mod) &&
- let Some(prim) = tcx.get_attrs(*def_id, sym::rustc_doc_primitive)
- .find_map(|attr| attr.value_str()) {
+ if matches!(tcx.def_kind(def_id), DefKind::Mod)
+ && let Some(prim) = tcx
+ .get_attrs(*def_id, sym::rustc_doc_primitive)
+ .find_map(|attr| attr.value_str())
+ {
format!(":{}", prim.as_u32())
} else {
- tcx
- .opt_item_name(*def_id)
- .map(|n| format!(":{}", n.as_u32()))
- .unwrap_or_default()
+ tcx.opt_item_name(*def_id)
+ .map(|n| format!(":{}", n.as_u32()))
+ .unwrap_or_default()
}
}
};
diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs
index 27e8a27ba..c1d90020e 100644
--- a/src/librustdoc/json/mod.rs
+++ b/src/librustdoc/json/mod.rs
@@ -80,9 +80,9 @@ impl<'tcx> JsonRenderer<'tcx> {
// document primitive items in an arbitrary crate by using
// `rustc_doc_primitive`.
let mut is_primitive_impl = false;
- if let clean::types::ItemKind::ImplItem(ref impl_) = *item.kind &&
- impl_.trait_.is_none() &&
- let clean::types::Type::Primitive(_) = impl_.for_
+ if let clean::types::ItemKind::ImplItem(ref impl_) = *item.kind
+ && impl_.trait_.is_none()
+ && let clean::types::Type::Primitive(_) = impl_.for_
{
is_primitive_impl = true;
}