@@ -57,7 +57,7 @@ use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModul
57
57
use rustc_codegen_ssa:: target_features:: supported_target_features;
58
58
use rustc_codegen_ssa:: traits:: { CodegenBackend , ExtraBackendMethods , ModuleBufferMethods , ThinBufferMethods , WriteBackendMethods } ;
59
59
use rustc_data_structures:: fx:: FxHashMap ;
60
- use rustc_errors:: { ErrorReported , Handler } ;
60
+ use rustc_errors:: { ErrorGuaranteed , Handler } ;
61
61
use rustc_metadata:: EncodedMetadata ;
62
62
use rustc_middle:: dep_graph:: { WorkProduct , WorkProductId } ;
63
63
use rustc_middle:: ty:: TyCtxt ;
@@ -93,7 +93,7 @@ impl CodegenBackend for GccCodegenBackend {
93
93
Box :: new ( res)
94
94
}
95
95
96
- fn join_codegen ( & self , ongoing_codegen : Box < dyn Any > , sess : & Session , _outputs : & OutputFilenames ) -> Result < ( CodegenResults , FxHashMap < WorkProductId , WorkProduct > ) , ErrorReported > {
96
+ fn join_codegen ( & self , ongoing_codegen : Box < dyn Any > , sess : & Session , _outputs : & OutputFilenames ) -> Result < ( CodegenResults , FxHashMap < WorkProductId , WorkProduct > ) , ErrorGuaranteed > {
97
97
let ( codegen_results, work_products) = ongoing_codegen
98
98
. downcast :: < rustc_codegen_ssa:: back:: write:: OngoingCodegen < GccCodegenBackend > > ( )
99
99
. expect ( "Expected GccCodegenBackend's OngoingCodegen, found Box<Any>" )
@@ -102,7 +102,7 @@ impl CodegenBackend for GccCodegenBackend {
102
102
Ok ( ( codegen_results, work_products) )
103
103
}
104
104
105
- fn link ( & self , sess : & Session , codegen_results : CodegenResults , outputs : & OutputFilenames ) -> Result < ( ) , ErrorReported > {
105
+ fn link ( & self , sess : & Session , codegen_results : CodegenResults , outputs : & OutputFilenames ) -> Result < ( ) , ErrorGuaranteed > {
106
106
use rustc_codegen_ssa:: back:: link:: link_binary;
107
107
108
108
link_binary :: < crate :: archive:: ArArchiveBuilder < ' _ > > (
0 commit comments