Remove unnecessary crate_name
parameter to after_krate
It's always `tcx.crate_name(LOCAL_CRATE)`, it doesn't need to be passed in separately.
This commit is contained in:
parent
25c15cdbe0
commit
f435f7185b
3 changed files with 7 additions and 19 deletions
|
@ -43,11 +43,7 @@ crate trait FormatRenderer<'tcx>: Sized {
|
||||||
/// Post processing hook for cleanup and dumping output to files.
|
/// Post processing hook for cleanup and dumping output to files.
|
||||||
///
|
///
|
||||||
/// A handler is available if the renderer wants to report errors.
|
/// A handler is available if the renderer wants to report errors.
|
||||||
fn after_krate(
|
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error>;
|
||||||
&mut self,
|
|
||||||
crate_name: Symbol,
|
|
||||||
diag: &rustc_errors::Handler,
|
|
||||||
) -> Result<(), Error>;
|
|
||||||
|
|
||||||
fn cache(&self) -> &Cache;
|
fn cache(&self) -> &Cache;
|
||||||
}
|
}
|
||||||
|
@ -73,7 +69,6 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render the crate documentation
|
// Render the crate documentation
|
||||||
let crate_name = krate.name;
|
|
||||||
let mut work = vec![(format_renderer.make_child_renderer(), krate.module)];
|
let mut work = vec![(format_renderer.make_child_renderer(), krate.module)];
|
||||||
|
|
||||||
let unknown = Symbol::intern("<unknown item>");
|
let unknown = Symbol::intern("<unknown item>");
|
||||||
|
@ -106,5 +101,5 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prof.extra_verbose_generic_activity("renderer_after_krate", T::descr())
|
prof.extra_verbose_generic_activity("renderer_after_krate", T::descr())
|
||||||
.run(|| format_renderer.after_krate(crate_name, diag))
|
.run(|| format_renderer.after_krate(diag))
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ use rustc_middle::ty::TyCtxt;
|
||||||
use rustc_session::Session;
|
use rustc_session::Session;
|
||||||
use rustc_span::edition::Edition;
|
use rustc_span::edition::Edition;
|
||||||
use rustc_span::source_map::FileName;
|
use rustc_span::source_map::FileName;
|
||||||
use rustc_span::{symbol::sym, Symbol};
|
use rustc_span::symbol::sym;
|
||||||
|
|
||||||
use super::cache::{build_index, ExternalLocation};
|
use super::cache::{build_index, ExternalLocation};
|
||||||
use super::print_item::{full_path, item_path, print_item};
|
use super::print_item::{full_path, item_path, print_item};
|
||||||
|
@ -494,11 +494,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn after_krate(
|
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error> {
|
||||||
&mut self,
|
let crate_name = self.tcx().crate_name(LOCAL_CRATE);
|
||||||
crate_name: Symbol,
|
|
||||||
diag: &rustc_errors::Handler,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let final_file = self.dst.join(&*crate_name.as_str()).join("all.html");
|
let final_file = self.dst.join(&*crate_name.as_str()).join("all.html");
|
||||||
let settings_file = self.dst.join("settings.html");
|
let settings_file = self.dst.join("settings.html");
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ use std::rc::Rc;
|
||||||
use rustc_data_structures::fx::FxHashMap;
|
use rustc_data_structures::fx::FxHashMap;
|
||||||
use rustc_middle::ty::TyCtxt;
|
use rustc_middle::ty::TyCtxt;
|
||||||
use rustc_session::Session;
|
use rustc_session::Session;
|
||||||
use rustc_span::{edition::Edition, Symbol};
|
use rustc_span::edition::Edition;
|
||||||
|
|
||||||
use rustdoc_json_types as types;
|
use rustdoc_json_types as types;
|
||||||
|
|
||||||
|
@ -204,11 +204,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn after_krate(
|
fn after_krate(&mut self, _diag: &rustc_errors::Handler) -> Result<(), Error> {
|
||||||
&mut self,
|
|
||||||
_crate_name: Symbol,
|
|
||||||
_diag: &rustc_errors::Handler,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
debug!("Done with crate");
|
debug!("Done with crate");
|
||||||
let mut index = (*self.index).clone().into_inner();
|
let mut index = (*self.index).clone().into_inner();
|
||||||
index.extend(self.get_trait_items());
|
index.extend(self.get_trait_items());
|
||||||
|
|
Loading…
Reference in a new issue