squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Revert "Improve code readability"

Browse source 
This reverts commit eb93d1bede.
This commit is contained in:
Guillaume Gomez 2023-01-19 20:26:01 +01:00
parent 286a632e72
commit 8b80bc1bf4
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/html/render/write_shared.rs
View file

@ -138,7 +138,7 @@ pub(super) fn write_shared(
Ok((ret, krates))
}
/// Read a file and return all lines that match the <code>"{crate}":{data},\ </code> format,
/// Read a file and return all lines that match the <code>"{crate}":{data},\</code> format,
/// and return a tuple `(Vec<DataString>, Vec<CrateNameString>)`.
///
/// This forms the payload of files that look like this:

32
src/librustdoc/visit_ast.rs
View file

@ -187,16 +187,6 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
ret
}
#[inline]
fn add_to_current_mod(
&mut self,
item: &'tcx hir::Item<'_>,
renamed: Option<Symbol>,
parent_id: Option<hir::HirId>,
) {
self.modules.last_mut().unwrap().items.push((item, renamed, parent_id))
}
fn visit_item_inner(
&mut self,
item: &'tcx hir::Item<'_>,
@ -257,7 +247,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
}
}
self.add_to_current_mod(item, renamed, parent_id);
self.modules.last_mut().unwrap().items.push((item, renamed, parent_id));
}
}
hir::ItemKind::Macro(ref macro_def, _) => {
@ -277,7 +267,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
let nonexported = !self.cx.tcx.has_attr(def_id, sym::macro_export);
if is_macro_2_0 || nonexported || self.inlining {
self.add_to_current_mod(item, renamed, None);
self.modules.last_mut().unwrap().items.push((item, renamed, None));
}
}
hir::ItemKind::Mod(ref m) => {
@ -293,20 +283,20 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
| hir::ItemKind::Static(..)
| hir::ItemKind::Trait(..)
| hir::ItemKind::TraitAlias(..) => {
self.add_to_current_mod(item, renamed, parent_id);
self.modules.last_mut().unwrap().items.push((item, renamed, parent_id))
}
hir::ItemKind::Const(..) => {
// Underscore constants do not correspond to a nameable item and
// so are never useful in documentation.
if name != kw::Underscore {
self.add_to_current_mod(item, renamed, parent_id);
self.modules.last_mut().unwrap().items.push((item, renamed, parent_id));
}
}
hir::ItemKind::Impl(impl_) => {
// Don't duplicate impls when inlining or if it's implementing a trait, we'll pick
// them up regardless of where they're located.
if !self.inlining && impl_.of_trait.is_none() {
self.add_to_current_mod(item, None, None);
self.modules.last_mut().unwrap().items.push((item, None, None));
}
}
}
@ -343,15 +333,17 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
// macro in the same module.
let mut inserted = FxHashSet::default();
for export in self.cx.tcx.module_reexports(CRATE_DEF_ID).unwrap_or(&[]) {
if let Res::Def(DefKind::Macro(_), def_id) = export.res &&
let Some(local_def_id) = def_id.as_local() &&
self.cx.tcx.has_attr(def_id, sym::macro_export) &&
inserted.insert(def_id)
{
if let Res::Def(DefKind::Macro(_), def_id) = export.res {
if let Some(local_def_id) = def_id.as_local() {
if self.cx.tcx.has_attr(def_id, sym::macro_export) {
if inserted.insert(def_id) {
let item = self.cx.tcx.hir().expect_item(local_def_id);
top_level_module.items.push((item, None, None));
}
}
}
}
}
self.cx.cache.hidden_cfg = self
.cx