diff options
| author | bors <bors@rust-lang.org> | 2023-05-25 06:02:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-25 06:02:11 +0000 |
| commit | 0b011b7b7e5d1a1737aa3337f01b79fd5f56cf04 (patch) | |
| tree | 687c1a746df87c74af8b0ae892e2cd6876c51e98 /compiler/rustc_interface/src | |
| parent | 776f22292fb5c2cc45f029d4b754662120732a6a (diff) | |
| parent | a9743e108a254809a7235460f9ba9e000776c507 (diff) | |
| download | rust-0b011b7b7e5d1a1737aa3337f01b79fd5f56cf04.tar.gz rust-0b011b7b7e5d1a1737aa3337f01b79fd5f56cf04.zip | |
Auto merge of #111933 - matthiaskrgr:rollup-m10k3ts, r=matthiaskrgr
Rollup of 4 pull requests
Successful merges:
- #95198 (Add slice::{split_,}{first,last}_chunk{,_mut})
- #109899 (Use apple-m1 as target CPU for aarch64-apple-darwin.)
- #111624 (Emit diagnostic for privately uninhabited uncovered witnesses.)
- #111875 (Don't leak the function that is called on drop)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/interface.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_interface/src/interface.rs b/compiler/rustc_interface/src/interface.rs index 681819703c2..39d56897999 100644 --- a/compiler/rustc_interface/src/interface.rs +++ b/compiler/rustc_interface/src/interface.rs @@ -3,9 +3,9 @@ use crate::util; use rustc_ast::token; use rustc_ast::{self as ast, LitKind, MetaItemKind}; use rustc_codegen_ssa::traits::CodegenBackend; +use rustc_data_structures::defer; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_data_structures::sync::Lrc; -use rustc_data_structures::OnDrop; use rustc_errors::registry::Registry; use rustc_errors::{ErrorGuaranteed, Handler}; use rustc_lint::LintStore; @@ -325,7 +325,7 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se rustc_span::set_source_map(compiler.sess.parse_sess.clone_source_map(), move || { let r = { - let _sess_abort_error = OnDrop(|| { + let _sess_abort_error = defer(|| { compiler.sess.finish_diagnostics(registry); }); |
