Skip to content

Commit 85414eb

Browse files
committed
Fix ui-fulldep tests
1 parent 618d4c3 commit 85414eb

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

compiler/rustc_smir/src/rustc_internal/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,9 @@ macro_rules! run_driver {
342342

343343
/// Runs the compiler against given target and tests it with `test_function`
344344
pub fn run(&mut self) -> Result<C, CompilerError<B>> {
345-
let compiler_result = rustc_driver::catch_fatal_errors(|| {
346-
RunCompiler::new(&self.args.clone(), self).run()
345+
let compiler_result = rustc_driver::catch_fatal_errors(|| -> interface::Result::<()> {
346+
RunCompiler::new(&self.args.clone(), self).run();
347+
Ok(())
347348
});
348349
match (compiler_result, self.result.take()) {
349350
(Ok(Ok(())), Some(ControlFlow::Continue(value))) => Ok(value),

tests/ui-fulldeps/codegen-backend/auxiliary/the_backend.rs

+8-14
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ extern crate rustc_span;
1515
extern crate rustc_symbol_mangling;
1616
extern crate rustc_target;
1717

18+
use std::any::Any;
19+
1820
use rustc_codegen_ssa::traits::CodegenBackend;
1921
use rustc_codegen_ssa::{CodegenResults, CrateInfo};
2022
use rustc_data_structures::fx::FxIndexMap;
21-
use rustc_errors::ErrorGuaranteed;
2223
use rustc_metadata::EncodedMetadata;
2324
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
2425
use rustc_middle::ty::TyCtxt;
25-
use rustc_session::config::OutputFilenames;
2626
use rustc_session::Session;
27-
use std::any::Any;
27+
use rustc_session::config::OutputFilenames;
2828

2929
struct TheBackend;
3030

@@ -60,17 +60,12 @@ impl CodegenBackend for TheBackend {
6060
(*codegen_results, FxIndexMap::default())
6161
}
6262

63-
fn link(
64-
&self,
65-
sess: &Session,
66-
codegen_results: CodegenResults,
67-
outputs: &OutputFilenames,
68-
) -> Result<(), ErrorGuaranteed> {
69-
use rustc_session::{
70-
config::{CrateType, OutFileName},
71-
output::out_filename,
72-
};
63+
fn link(&self, sess: &Session, codegen_results: CodegenResults, outputs: &OutputFilenames) {
7364
use std::io::Write;
65+
66+
use rustc_session::config::{CrateType, OutFileName};
67+
use rustc_session::output::out_filename;
68+
7469
let crate_name = codegen_results.crate_info.local_crate_name;
7570
for &crate_type in sess.opts.crate_types.iter() {
7671
if crate_type != CrateType::Rlib {
@@ -88,7 +83,6 @@ impl CodegenBackend for TheBackend {
8883
}
8984
}
9085
}
91-
Ok(())
9286
}
9387
}
9488

tests/ui-fulldeps/obtain-borrowck.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ fn main() {
4747
rustc_args.push("-Zpolonius".to_owned());
4848
let mut callbacks = CompilerCalls::default();
4949
// Call the Rust compiler with our callbacks.
50-
rustc_driver::RunCompiler::new(&rustc_args, &mut callbacks).run()
50+
rustc_driver::RunCompiler::new(&rustc_args, &mut callbacks).run();
51+
Ok(())
5152
});
5253
std::process::exit(exit_code);
5354
}

tests/ui-fulldeps/run-compiler-twice.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ extern crate rustc_span;
1717

1818
use std::path::{Path, PathBuf};
1919

20-
use rustc_interface::Linker;
21-
use rustc_interface::interface;
20+
use rustc_interface::{Linker, interface};
2221
use rustc_session::config::{Input, Options, OutFileName, OutputType, OutputTypes};
2322
use rustc_span::FileName;
2423

@@ -79,11 +78,11 @@ fn compile(code: String, output: PathBuf, sysroot: PathBuf, linker: Option<&Path
7978

8079
interface::run_compiler(config, |compiler| {
8180
let linker = compiler.enter(|queries| {
82-
queries.global_ctxt()?.enter(|tcx| {
83-
tcx.analysis(())?;
81+
queries.global_ctxt().enter(|tcx| {
82+
let _ = tcx.analysis(());
8483
Linker::codegen_and_build_linker(tcx, &*compiler.codegen_backend)
8584
})
8685
});
87-
linker.unwrap().link(&compiler.sess, &*compiler.codegen_backend).unwrap();
86+
linker.link(&compiler.sess, &*compiler.codegen_backend);
8887
});
8988
}

0 commit comments

Comments
 (0)