From 971010ea5a8635dc55ad436c785bb1efe3a67cdd Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Mon, 20 Nov 2023 15:09:05 +1100 Subject: Merge `Queries::{ongoing_codegen,linker}`. There is no real need for them to be separate. --- compiler/rustc_driver_impl/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler/rustc_driver_impl') diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs index 19730e81c85..5ab14fbc687 100644 --- a/compiler/rustc_driver_impl/src/lib.rs +++ b/compiler/rustc_driver_impl/src/lib.rs @@ -453,7 +453,7 @@ fn run_compiler( return early_exit(); } - let ongoing_codegen = queries.ongoing_codegen()?; + let linker = queries.codegen_and_build_linker()?; // This must run after monomorphization so that all generic types // have been instantiated. @@ -467,7 +467,6 @@ fn run_compiler( sess.code_stats.print_vtable_sizes(crate_name); } - let linker = queries.linker(ongoing_codegen)?; Ok(Some(linker)) })?; -- cgit 1.4.1-3-g733a5