diff options
| author | mark <markm@cs.wisc.edu> | 2022-01-23 12:34:26 -0600 |
|---|---|---|
| committer | mark <markm@cs.wisc.edu> | 2022-03-02 09:45:25 -0600 |
| commit | e489a94deef3d41513fe4254804d730f0fd6cbc0 (patch) | |
| tree | d2c3743151e614831817cb8c27487a820826cc29 /compiler/rustc_interface/src/passes.rs | |
| parent | c42d846add941a26bd254911e16f02c4a3f9346f (diff) | |
| download | rust-e489a94deef3d41513fe4254804d730f0fd6cbc0.tar.gz rust-e489a94deef3d41513fe4254804d730f0fd6cbc0.zip | |
rename ErrorReported -> ErrorGuaranteed
Diffstat (limited to 'compiler/rustc_interface/src/passes.rs')
| -rw-r--r-- | compiler/rustc_interface/src/passes.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index c0552fd200b..2cdcf0b11d1 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -10,7 +10,7 @@ use rustc_codegen_ssa::traits::CodegenBackend; use rustc_data_structures::parallel; use rustc_data_structures::sync::{Lrc, OnceCell, WorkerLocal}; use rustc_data_structures::temp_dir::MaybeTempDir; -use rustc_errors::{Applicability, ErrorReported, PResult}; +use rustc_errors::{Applicability, ErrorGuaranteed, PResult}; use rustc_expand::base::{ExtCtxt, LintStoreExpand, ResolverExpand}; use rustc_hir::def_id::{StableCrateId, LOCAL_CRATE}; use rustc_hir::Crate; @@ -373,7 +373,7 @@ pub fn configure_and_expand( if recursion_limit_hit { // If we hit a recursion limit, exit early to avoid later passes getting overwhelmed // with a large AST - Err(ErrorReported) + Err(ErrorGuaranteed) } else { Ok(krate) } @@ -758,7 +758,7 @@ pub fn prepare_outputs( executable", input_path.display() )); - return Err(ErrorReported); + return Err(ErrorGuaranteed); } if let Some(dir_path) = output_conflicts_with_dir(&output_paths) { sess.err(&format!( @@ -767,7 +767,7 @@ pub fn prepare_outputs( input_path.display(), dir_path.display() )); - return Err(ErrorReported); + return Err(ErrorGuaranteed); } } } @@ -775,7 +775,7 @@ pub fn prepare_outputs( if let Some(ref dir) = compiler.temps_dir { if fs::create_dir_all(dir).is_err() { sess.err("failed to find or create the directory specified by `--temps-dir`"); - return Err(ErrorReported); + return Err(ErrorGuaranteed); } } @@ -788,7 +788,7 @@ pub fn prepare_outputs( if let Some(ref dir) = compiler.output_dir { if fs::create_dir_all(dir).is_err() { sess.err("failed to find or create the directory specified by `--out-dir`"); - return Err(ErrorReported); + return Err(ErrorGuaranteed); } } } @@ -993,7 +993,7 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> { // lint warnings and so on -- kindck used to do this abort, but // kindck is gone now). -nmatsakis if sess.has_errors() { - return Err(ErrorReported); + return Err(ErrorGuaranteed); } sess.time("misc_checking_3", || { |
