about summary refs log tree commit diff
path: root/compiler/rustc_driver_impl/src
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2023-11-20 15:09:05 +1100
committerNicholas Nethercote <n.nethercote@gmail.com>2023-11-22 13:22:49 +1100
commit971010ea5a8635dc55ad436c785bb1efe3a67cdd (patch)
tree5c67de95e67a91d6af53505bdefe65d0b8ff94f4 /compiler/rustc_driver_impl/src
parent3a4798c92d5ea9e4a3a0e6d4e2b597b0e9c7cf9a (diff)
downloadrust-971010ea5a8635dc55ad436c785bb1efe3a67cdd.tar.gz
rust-971010ea5a8635dc55ad436c785bb1efe3a67cdd.zip
Merge `Queries::{ongoing_codegen,linker}`.
There is no real need for them to be separate.
Diffstat (limited to 'compiler/rustc_driver_impl/src')
-rw-r--r--compiler/rustc_driver_impl/src/lib.rs3
1 files changed, 1 insertions, 2 deletions
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))
         })?;