File tree 2 files changed +7
-8
lines changed
compiler/rustc_mir_transform/src
2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -90,20 +90,20 @@ macro_rules! declare_passes {
90
90
) +
91
91
) *
92
92
93
- static PASS_NAMES : LazyLock <Vec < String >> = LazyLock :: new( || vec! [
93
+ static PASS_NAMES : LazyLock <FxIndexSet < & str >> = LazyLock :: new( || [
94
94
// Fake marker pass
95
- "PreCodegen" . to_string ( ) ,
95
+ "PreCodegen" ,
96
96
$(
97
97
$(
98
- stringify!( $pass_name) . to_string ( ) ,
98
+ stringify!( $pass_name) ,
99
99
$(
100
100
$(
101
- $mod_name:: $pass_name:: $ident. name( ) . to_string ( ) ,
101
+ $mod_name:: $pass_name:: $ident. name( ) ,
102
102
) *
103
103
) ?
104
104
) +
105
105
) *
106
- ] ) ;
106
+ ] . into_iter ( ) . collect ( ) ) ;
107
107
} ;
108
108
}
109
109
Original file line number Diff line number Diff line change @@ -200,9 +200,8 @@ fn run_passes_inner<'tcx>(
200
200
201
201
let named_passes: FxIndexSet < _ > =
202
202
overridden_passes. iter ( ) . map ( |( name, _) | name. as_str ( ) ) . collect ( ) ;
203
- let known_passes: FxIndexSet < _ > = crate :: PASS_NAMES . iter ( ) . map ( |p| p. as_str ( ) ) . collect ( ) ;
204
203
205
- for & name in named_passes. difference ( & known_passes ) {
204
+ for & name in named_passes. difference ( & * crate :: PASS_NAMES ) {
206
205
tcx. dcx ( ) . emit_warn ( errors:: UnknownPassName { name } ) ;
207
206
}
208
207
@@ -213,7 +212,7 @@ fn run_passes_inner<'tcx>(
213
212
{
214
213
let used_passes: FxIndexSet < _ > = passes. iter ( ) . map ( |p| p. name ( ) ) . collect ( ) ;
215
214
216
- let undeclared = used_passes. difference ( & known_passes ) . collect :: < Vec < _ > > ( ) ;
215
+ let undeclared = used_passes. difference ( & * crate :: PASS_NAMES ) . collect :: < Vec < _ > > ( ) ;
217
216
if let Some ( ( name, rest) ) = undeclared. split_first ( ) {
218
217
let mut err =
219
218
tcx. dcx ( ) . struct_bug ( format ! ( "pass `{name}` is not declared in `PASS_NAMES`" ) ) ;
You can’t perform that action at this time.
0 commit comments