Fix sync conflict

GuillaumeGomez · GuillaumeGomez · commit a03a0f1d4421 · 2025-08-26T17:25:45.000+02:00
diff --git a/compiler/rustc_codegen_gcc/src/lib.rs b/compiler/rustc_codegen_gcc/src/lib.rs
@@ -361,7 +361,7 @@ impl WriteBackendMethods for GccCodegenBackend {
         _exported_symbols_for_lto: &[String],
         each_linked_rlib_for_lto: &[PathBuf],
         modules: Vec<FatLtoInput<Self>>,
-    ) -> Result<ModuleCodegen<Self::Module>, FatalError> {
+    ) -> ModuleCodegen<Self::Module> {
         back::lto::run_fat(cgcx, each_linked_rlib_for_lto, modules)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ impl WriteBackendMethods for GccCodegenBackend {`
`361`	`361`	`_exported_symbols_for_lto: &[String],`
`362`	`362`	`each_linked_rlib_for_lto: &[PathBuf],`
`363`	`363`	`modules: Vec<FatLtoInput<Self>>,`
`364`		`- ) -> Result<ModuleCodegen<Self::Module>, FatalError> {`
	`364`	`+ ) -> ModuleCodegen<Self::Module> {`
`365`	`365`	`back::lto::run_fat(cgcx, each_linked_rlib_for_lto, modules)`
`366`	`366`	`}`
`367`	`367`