File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -43,11 +43,7 @@ crate trait FormatRenderer<'tcx>: Sized {
43
43
/// Post processing hook for cleanup and dumping output to files.
44
44
///
45
45
/// 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 > ;
51
47
52
48
fn cache ( & self ) -> & Cache ;
53
49
}
@@ -73,7 +69,6 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
73
69
}
74
70
75
71
// Render the crate documentation
76
- let crate_name = krate. name ;
77
72
let mut work = vec ! [ ( format_renderer. make_child_renderer( ) , krate. module) ] ;
78
73
79
74
let unknown = Symbol :: intern ( "<unknown item>" ) ;
@@ -106,5 +101,5 @@ crate fn run_format<'tcx, T: FormatRenderer<'tcx>>(
106
101
}
107
102
}
108
103
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) )
110
105
}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ use rustc_middle::ty::TyCtxt;
11
11
use rustc_session:: Session ;
12
12
use rustc_span:: edition:: Edition ;
13
13
use rustc_span:: source_map:: FileName ;
14
- use rustc_span:: { symbol:: sym, Symbol } ;
14
+ use rustc_span:: symbol:: sym;
15
15
16
16
use super :: cache:: { build_index, ExternalLocation } ;
17
17
use super :: print_item:: { full_path, item_path, print_item} ;
@@ -494,11 +494,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
494
494
}
495
495
}
496
496
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 ) ;
502
499
let final_file = self . dst . join ( & * crate_name. as_str ( ) ) . join ( "all.html" ) ;
503
500
let settings_file = self . dst . join ( "settings.html" ) ;
504
501
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ use std::rc::Rc;
14
14
use rustc_data_structures:: fx:: FxHashMap ;
15
15
use rustc_middle:: ty:: TyCtxt ;
16
16
use rustc_session:: Session ;
17
- use rustc_span:: { edition:: Edition , Symbol } ;
17
+ use rustc_span:: edition:: Edition ;
18
18
19
19
use rustdoc_json_types as types;
20
20
@@ -204,11 +204,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
204
204
Ok ( ( ) )
205
205
}
206
206
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 > {
212
208
debug ! ( "Done with crate" ) ;
213
209
let mut index = ( * self . index ) . clone ( ) . into_inner ( ) ;
214
210
index. extend ( self . get_trait_items ( ) ) ;
You can’t perform that action at this time.
0 commit comments