Skip to content

Commit

Permalink
Auto merge of rust-lang#90867 - hi-rustin:rustin-patch-rustdoc, r=Cra…
Browse files Browse the repository at this point in the history
…ftSpider

Delete rustdoc::doctree

close rust-lang#90864
  • Loading branch information
bors committed Nov 14, 2021
2 parents 589ad6a + e7a20c9 commit f820d9d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ use std::hash::Hash;
use std::{mem, vec};

use crate::core::{self, DocContext, ImplTraitParam};
use crate::doctree;
use crate::formats::item_type::ItemType;
use crate::visit_ast::Module as DocModule;

use utils::*;

Expand All @@ -54,7 +54,7 @@ crate trait Clean<T> {
fn clean(&self, cx: &mut DocContext<'_>) -> T;
}

impl Clean<Item> for doctree::Module<'_> {
impl Clean<Item> for DocModule<'_> {
fn clean(&self, cx: &mut DocContext<'_>) -> Item {
let mut items: Vec<Item> = vec![];
items.extend(self.foreigns.iter().map(|x| x.clean(cx)));
Expand Down
27 changes: 0 additions & 27 deletions src/librustdoc/doctree.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ mod config;
mod core;
mod docfs;
mod doctest;
mod doctree;
mod error;
mod externalfiles;
mod fold;
Expand Down
25 changes: 24 additions & 1 deletion src/librustdoc/visit_ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,35 @@ use rustc_middle::middle::privacy::AccessLevel;
use rustc_middle::ty::TyCtxt;
use rustc_span::def_id::{CRATE_DEF_ID, LOCAL_CRATE};
use rustc_span::symbol::{kw, sym, Symbol};
use rustc_span::Span;

use std::mem;

use crate::clean::{self, cfg::Cfg, AttributesExt, NestedAttributesExt};
use crate::core;
use crate::doctree::*;

/// This module is used to store stuff from Rust's AST in a more convenient
/// manner (and with prettier names) before cleaning.
#[derive(Debug)]
crate struct Module<'hir> {
crate name: Symbol,
crate where_inner: Span,
crate mods: Vec<Module<'hir>>,
crate id: hir::HirId,
// (item, renamed)
crate items: Vec<(&'hir hir::Item<'hir>, Option<Symbol>)>,
crate foreigns: Vec<(&'hir hir::ForeignItem<'hir>, Option<Symbol>)>,
}

impl Module<'hir> {
crate fn new(name: Symbol, id: hir::HirId, where_inner: Span) -> Module<'hir> {
Module { name, id, where_inner, mods: Vec::new(), items: Vec::new(), foreigns: Vec::new() }
}

crate fn where_outer(&self, tcx: TyCtxt<'_>) -> Span {
tcx.hir().span(self.id)
}
}

// FIXME: Should this be replaced with tcx.def_path_str?
fn def_id_to_path(tcx: TyCtxt<'_>, did: DefId) -> Vec<String> {
Expand Down

0 comments on commit f820d9d

Please sign in to comment.