diff options
| author | bors <bors@rust-lang.org> | 2020-01-09 02:05:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-09 02:05:15 +0000 |
| commit | adc65725004c8aac16392fe4052c3e347181157d (patch) | |
| tree | 01f6119b01516f50953d5b4a1f3cfdb44bf6742a /src/librustc_errors | |
| parent | caa231d998a5e853c7ba1455d7a05b500df9d63c (diff) | |
| parent | b24de8f0f861781cd83018ad43d7aa9dd2cb55bb (diff) | |
| download | rust-adc65725004c8aac16392fe4052c3e347181157d.tar.gz rust-adc65725004c8aac16392fe4052c3e347181157d.zip | |
Auto merge of #68034 - Centril:rollup-3d9pq14, r=Centril
Rollup of 12 pull requests Successful merges: - #67630 (Treat extern statics just like statics in the "const pointer to static" representation) - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path) - #67884 (Fix incremental builds of core by allowing unused attribute.) - #67966 (Use matches macro in libcore and libstd) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) - #67986 (Display more informative ICE) - #67990 (slice patterns: harden match-based borrowck tests) - #68005 (Improve E0184 explanation) - #68009 (Spell check librustc_error_codes) - #68023 (Fix issue #68008) - #68024 (Remove `-Z continue-parse-after-error`) - #68026 (Small improvements in lexical_region_resolve) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_errors')
| -rw-r--r-- | src/librustc_errors/lib.rs | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 2279ed85954..99a6d6f8ec2 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -278,7 +278,6 @@ struct HandlerInner { err_count: usize, deduplicated_err_count: usize, emitter: Box<dyn Emitter + sync::Send>, - continue_after_error: bool, delayed_span_bugs: Vec<Diagnostic>, /// This set contains the `DiagnosticId` of all emitted diagnostics to avoid @@ -402,7 +401,6 @@ impl Handler { err_count: 0, deduplicated_err_count: 0, emitter, - continue_after_error: true, delayed_span_bugs: Vec::new(), taught_diagnostics: Default::default(), emitted_diagnostic_codes: Default::default(), @@ -412,10 +410,6 @@ impl Handler { } } - pub fn set_continue_after_error(&self, continue_after_error: bool) { - self.inner.borrow_mut().continue_after_error = continue_after_error; - } - // This is here to not allow mutation of flags; // as of this writing it's only used in tests in librustc. pub fn can_emit_warnings(&self) -> bool { @@ -672,10 +666,6 @@ impl Handler { self.inner.borrow_mut().abort_if_errors() } - pub fn abort_if_errors_and_should_abort(&self) { - self.inner.borrow_mut().abort_if_errors_and_should_abort() - } - /// `true` if we haven't taught a diagnostic with this code already. /// The caller must then teach the user about such a diagnostic. /// @@ -696,7 +686,6 @@ impl Handler { fn emit_diag_at_span(&self, mut diag: Diagnostic, sp: impl Into<MultiSpan>) { let mut inner = self.inner.borrow_mut(); inner.emit_diagnostic(diag.set_span(sp)); - inner.abort_if_errors_and_should_abort(); } pub fn emit_artifact_notification(&self, path: &Path, artifact_type: &str) { @@ -830,14 +819,6 @@ impl HandlerInner { self.has_errors() || !self.delayed_span_bugs.is_empty() } - fn abort_if_errors_and_should_abort(&mut self) { - self.emit_stashed_diagnostics(); - - if self.has_errors() && !self.continue_after_error { - FatalError.raise(); - } - } - fn abort_if_errors(&mut self) { self.emit_stashed_diagnostics(); @@ -853,7 +834,6 @@ impl HandlerInner { fn emit_diag_at_span(&mut self, mut diag: Diagnostic, sp: impl Into<MultiSpan>) { self.emit_diagnostic(diag.set_span(sp)); - self.abort_if_errors_and_should_abort(); } fn delay_span_bug(&mut self, sp: impl Into<MultiSpan>, msg: &str) { |
