Skip to content

Commit 76b9b16

Browse files
committed
rustc_codegen_ssa: remove unneeded wrapping of return type of execute_copy_from_cache_work_item (always returns Ok(..))
1 parent 393878b commit 76b9b16

File tree

1 file changed

+4
-4
lines changed
  • compiler/rustc_codegen_ssa/src/back

1 file changed

+4
-4
lines changed

compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ fn execute_work_item<B: ExtraBackendMethods>(
735735
match work_item {
736736
WorkItem::Optimize(module) => execute_optimize_work_item(cgcx, module, module_config),
737737
WorkItem::CopyPostLtoArtifacts(module) => {
738-
execute_copy_from_cache_work_item(cgcx, module, module_config)
738+
Ok(execute_copy_from_cache_work_item(cgcx, module, module_config))
739739
}
740740
WorkItem::LTO(module) => execute_lto_work_item(cgcx, module, module_config),
741741
}
@@ -844,7 +844,7 @@ fn execute_copy_from_cache_work_item<B: ExtraBackendMethods>(
844844
cgcx: &CodegenContext<B>,
845845
module: CachedModuleCodegen,
846846
module_config: &ModuleConfig,
847-
) -> Result<WorkItemResult<B>, FatalError> {
847+
) -> WorkItemResult<B> {
848848
let incr_comp_session_dir = cgcx.incr_comp_session_dir.as_ref().unwrap();
849849
let mut object = None;
850850
if let Some(saved_file) = module.source.saved_file {
@@ -870,13 +870,13 @@ fn execute_copy_from_cache_work_item<B: ExtraBackendMethods>(
870870

871871
assert_eq!(object.is_some(), module_config.emit_obj != EmitObj::None);
872872

873-
Ok(WorkItemResult::Compiled(CompiledModule {
873+
WorkItemResult::Compiled(CompiledModule {
874874
name: module.name,
875875
kind: ModuleKind::Regular,
876876
object,
877877
dwarf_object: None,
878878
bytecode: None,
879-
}))
879+
})
880880
}
881881

882882
fn execute_lto_work_item<B: ExtraBackendMethods>(

0 commit comments

Comments
 (0)