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

Remove unnecessary crate_name parameter to after_krate

Browse source 
It's always `tcx.crate_name(LOCAL_CRATE)`, it doesn't need to be passed
in separately.
This commit is contained in:
Joshua Nelson 2021-04-22 19:27:37 -04:00
parent 25c15cdbe0
commit f435f7185b
3 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/librustdoc/formats/renderer.rs
View file

@ -43,11 +43,7 @@ crate trait FormatRenderer<'tcx>: Sized {
/// Post processing hook for cleanup and dumping output to files.
///
/// A handler is available if the renderer wants to report errors.
fn after_krate(
&mut self,
crate_name: Symbol,
diag: &rustc_errors::Handler,
) -> Result<(), Error>;
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error>;
fn cache(&self) -> &Cache;
}
@ -73,7 +69,6 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
}
// Render the crate documentation
let crate_name = krate.name;
let mut work = vec![(format_renderer.make_child_renderer(), krate.module)];
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())
.run(|| format_renderer.after_krate(crate_name, diag))
.run(|| format_renderer.after_krate(diag))
}

9
src/librustdoc/html/render/context.rs
View file

@ -11,7 +11,7 @@ use rustc_middle::ty::TyCtxt;
use rustc_session::Session;
use rustc_span::edition::Edition;
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::print_item::{full_path, item_path, print_item};
@ -494,11 +494,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
}
}
fn after_krate(
&mut self,
crate_name: Symbol,
diag: &rustc_errors::Handler,
) -> Result<(), Error> {
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error> {
let crate_name = self.tcx().crate_name(LOCAL_CRATE);
let final_file = self.dst.join(&*crate_name.as_str()).join("all.html");
let settings_file = self.dst.join("settings.html");

8
src/librustdoc/json/mod.rs
View file

@ -14,7 +14,7 @@ use std::rc::Rc;
use rustc_data_structures::fx::FxHashMap;
use rustc_middle::ty::TyCtxt;
use rustc_session::Session;
use rustc_span::{edition::Edition, Symbol};
use rustc_span::edition::Edition;
use rustdoc_json_types as types;
@ -204,11 +204,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
Ok(())
}
fn after_krate(
&mut self,
_crate_name: Symbol,
_diag: &rustc_errors::Handler,
) -> Result<(), Error> {
fn after_krate(&mut self, _diag: &rustc_errors::Handler) -> Result<(), Error> {
debug!("Done with crate");
let mut index = (*self.index).clone().into_inner();
index.extend(self.get_trait_items());