diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2021-04-22 19:27:37 -0400 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2021-04-22 19:27:37 -0400 |
| commit | f435f7185b634733834a61418dc4cba6a58aa1ec (patch) | |
| tree | f630412571c4115aa8d06806b1986965f649d5ef | |
| parent | 25c15cdbe070f49d708f34750df2632e38bd4846 (diff) | |
| download | rust-f435f7185b634733834a61418dc4cba6a58aa1ec.tar.gz rust-f435f7185b634733834a61418dc4cba6a58aa1ec.zip | |
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.
| -rw-r--r-- | src/librustdoc/formats/renderer.rs | 9 | ||||
| -rw-r--r-- | src/librustdoc/html/render/context.rs | 9 | ||||
| -rw-r--r-- | src/librustdoc/json/mod.rs | 8 |
3 files changed, 7 insertions, 19 deletions
diff --git a/src/librustdoc/formats/renderer.rs b/src/librustdoc/formats/renderer.rs index ae97cd64fb5..94f860739df 100644 --- a/src/librustdoc/formats/renderer.rs +++ b/src/librustdoc/formats/renderer.rs @@ -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)) } diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 0aa7aa763c2..9a4d02114cc 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -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"); diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs index db3a0c5ceb1..da5a6d7af13 100644 --- a/src/librustdoc/json/mod.rs +++ b/src/librustdoc/json/mod.rs @@ -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()); |
