diff options
| author | bors <bors@rust-lang.org> | 2018-02-18 17:50:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-18 17:50:21 +0000 |
| commit | 27a046e9338fb0455c33b13e8fe28da78212dedc (patch) | |
| tree | 004849f31563f7dd4c1eb9f54d12ad392887c077 /src/librustdoc/core.rs | |
| parent | 1ad094d81c97b3d2dd8e980ccd1475a80647540d (diff) | |
| parent | cc20de3993bc47be613d20fdd4ec3c35cc410fcd (diff) | |
| download | rust-27a046e9338fb0455c33b13e8fe28da78212dedc.tar.gz rust-27a046e9338fb0455c33b13e8fe28da78212dedc.zip | |
Auto merge of #48322 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests - Successful merges: #48194, #48273, #48274, #48275, #48282, #48312 - Failed merges:
Diffstat (limited to 'src/librustdoc/core.rs')
| -rw-r--r-- | src/librustdoc/core.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 0674a0b5a3b..81babd803a5 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -36,7 +36,6 @@ use std::path::PathBuf; use visit_ast::RustdocVisitor; use clean; use clean::Clean; -use html::markdown::RenderType; use html::render::RenderInfo; pub use rustc::session::config::Input; @@ -59,9 +58,6 @@ pub struct DocContext<'a, 'tcx: 'a, 'rcx: 'a> { pub renderinfo: RefCell<RenderInfo>, /// Later on moved through `clean::Crate` into `html::render::CACHE_KEY` pub external_traits: RefCell<FxHashMap<DefId, clean::Trait>>, - /// Which markdown renderer to use when extracting links. - pub render_type: RenderType, - // The current set of type and lifetime substitutions, // for expanding type aliases at the HIR level: @@ -111,8 +107,7 @@ pub fn run_core(search_paths: SearchPaths, triple: Option<String>, maybe_sysroot: Option<PathBuf>, allow_warnings: bool, - force_unstable_if_unmarked: bool, - render_type: RenderType) -> (clean::Crate, RenderInfo) + force_unstable_if_unmarked: bool) -> (clean::Crate, RenderInfo) { // Parse, resolve, and typecheck the given crate. @@ -242,7 +237,6 @@ pub fn run_core(search_paths: SearchPaths, access_levels: RefCell::new(access_levels), external_traits: Default::default(), renderinfo: Default::default(), - render_type, ty_substs: Default::default(), lt_substs: Default::default(), mod_ids: Default::default(), |
