diff options
| author | bors <bors@rust-lang.org> | 2022-03-02 16:13:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-02 16:13:38 +0000 |
| commit | 08504c64aa7c4163a51c1982ed10075bb89cec0e (patch) | |
| tree | d2c3743151e614831817cb8c27487a820826cc29 /compiler/rustc_interface/src/interface.rs | |
| parent | c42d846add941a26bd254911e16f02c4a3f9346f (diff) | |
| parent | e489a94deef3d41513fe4254804d730f0fd6cbc0 (diff) | |
Auto merge of #93244 - mark-i-m:doomed, r=oli-obk
Rename `ErrorReported` -> `ErrorGuaranteed` r? `@eddyb` cc https://github.com/rust-lang/rust/pull/93222 https://github.com/rust-lang/rust/issues/69426 The idea is that we would like to use it for both errors and `delay_span_bug`. Its semantics indicate a _guarantee_ that compilation will fail.
Diffstat (limited to 'compiler/rustc_interface/src/interface.rs')
| -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 20835262324..7f4a4ffadec 100644 --- a/compiler/rustc_interface/src/interface.rs +++ b/compiler/rustc_interface/src/interface.rs @@ -8,7 +8,7 @@ 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::{ErrorReported, Handler}; +use rustc_errors::{ErrorGuaranteed, Handler}; use rustc_lint::LintStore; use rustc_middle::ty; use rustc_parse::maybe_new_parser_from_source_str; @@ -23,7 +23,7 @@ use rustc_span::symbol::sym; use std::path::PathBuf; use std::result; -pub type Result<T> = result::Result<T, ErrorReported>; +pub type Result<T> = result::Result<T, ErrorGuaranteed>; /// Represents a compiler session. /// |
