Skip to content

Commit f435f71

Browse files
committed
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.
1 parent 25c15cd commit f435f71

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

src/librustdoc/formats/renderer.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ crate trait FormatRenderer<'tcx>: Sized {
4343
/// Post processing hook for cleanup and dumping output to files.
4444
///
4545
/// A handler is available if the renderer wants to report errors.
46-
fn after_krate(
47-
&mut self,
48-
crate_name: Symbol,
49-
diag: &rustc_errors::Handler,
50-
) -> Result<(), Error>;
46+
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error>;
5147

5248
fn cache(&self) -> &Cache;
5349
}
@@ -73,7 +69,6 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
7369
}
7470

7571
// Render the crate documentation
76-
let crate_name = krate.name;
7772
let mut work = vec![(format_renderer.make_child_renderer(), krate.module)];
7873

7974
let unknown = Symbol::intern("<unknown item>");
@@ -106,5 +101,5 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
106101
}
107102
}
108103
prof.extra_verbose_generic_activity("renderer_after_krate", T::descr())
109-
.run(|| format_renderer.after_krate(crate_name, diag))
104+
.run(|| format_renderer.after_krate(diag))
110105
}

src/librustdoc/html/render/context.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_middle::ty::TyCtxt;
1111
use rustc_session::Session;
1212
use rustc_span::edition::Edition;
1313
use rustc_span::source_map::FileName;
14-
use rustc_span::{symbol::sym, Symbol};
14+
use rustc_span::symbol::sym;
1515

1616
use super::cache::{build_index, ExternalLocation};
1717
use super::print_item::{full_path, item_path, print_item};
@@ -494,11 +494,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
494494
}
495495
}
496496

497-
fn after_krate(
498-
&mut self,
499-
crate_name: Symbol,
500-
diag: &rustc_errors::Handler,
501-
) -> Result<(), Error> {
497+
fn after_krate(&mut self, diag: &rustc_errors::Handler) -> Result<(), Error> {
498+
let crate_name = self.tcx().crate_name(LOCAL_CRATE);
502499
let final_file = self.dst.join(&*crate_name.as_str()).join("all.html");
503500
let settings_file = self.dst.join("settings.html");
504501

src/librustdoc/json/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::rc::Rc;
1414
use rustc_data_structures::fx::FxHashMap;
1515
use rustc_middle::ty::TyCtxt;
1616
use rustc_session::Session;
17-
use rustc_span::{edition::Edition, Symbol};
17+
use rustc_span::edition::Edition;
1818

1919
use rustdoc_json_types as types;
2020

@@ -204,11 +204,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
204204
Ok(())
205205
}
206206

207-
fn after_krate(
208-
&mut self,
209-
_crate_name: Symbol,
210-
_diag: &rustc_errors::Handler,
211-
) -> Result<(), Error> {
207+
fn after_krate(&mut self, _diag: &rustc_errors::Handler) -> Result<(), Error> {
212208
debug!("Done with crate");
213209
let mut index = (*self.index).clone().into_inner();
214210
index.extend(self.get_trait_items());

0 commit comments

Comments
 (0)