@@ -57,7 +57,7 @@ use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModul
5757use rustc_codegen_ssa:: target_features:: supported_target_features;
5858use rustc_codegen_ssa:: traits:: { CodegenBackend , ExtraBackendMethods , ModuleBufferMethods , ThinBufferMethods , WriteBackendMethods } ;
5959use rustc_data_structures:: fx:: FxHashMap ;
60- use rustc_errors:: { ErrorReported , Handler } ;
60+ use rustc_errors:: { ErrorGuaranteed , Handler } ;
6161use rustc_metadata:: EncodedMetadata ;
6262use rustc_middle:: dep_graph:: { WorkProduct , WorkProductId } ;
6363use rustc_middle:: ty:: TyCtxt ;
@@ -93,7 +93,7 @@ impl CodegenBackend for GccCodegenBackend {
9393 Box :: new ( res)
9494 }
9595
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 > {
9797 let ( codegen_results, work_products) = ongoing_codegen
9898 . downcast :: < rustc_codegen_ssa:: back:: write:: OngoingCodegen < GccCodegenBackend > > ( )
9999 . expect ( "Expected GccCodegenBackend's OngoingCodegen, found Box<Any>" )
@@ -102,7 +102,7 @@ impl CodegenBackend for GccCodegenBackend {
102102 Ok ( ( codegen_results, work_products) )
103103 }
104104
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 > {
106106 use rustc_codegen_ssa:: back:: link:: link_binary;
107107
108108 link_binary :: < crate :: archive:: ArArchiveBuilder < ' _ > > (
0 commit comments