Tweak error counting.
We have several methods indicating the presence of errors, lint errors, and delayed bugs. I find it frustrating that it's very unclear which one you should use in any particular spot. This commit attempts to instill a basic principle of "use the least general one possible", because that reflects reality in practice -- `has_errors` is the least general one and has by far the most uses (esp. via `abort_if_errors`). Specifics: - Add some comments giving some usage guidelines. - Prefer `has_errors` to comparing `err_count` to zero. - Remove `has_errors_or_span_delayed_bugs` because it's a weird one: in the cases where we need to count delayed bugs, we should really be counting lint errors as well. - Rename `is_compilation_going_to_fail` as `has_errors_or_lint_errors_or_span_delayed_bugs`, for consistency with `has_errors` and `has_errors_or_lint_errors`. - Change a few other `has_errors_or_lint_errors` calls to `has_errors`, as per the "least general" principle. This didn't turn out to be as neat as I hoped when I started, but I think it's still an improvement.
This commit is contained in:
parent
807c8687de
commit
1f9fa2305a
14 changed files with 35 additions and 32 deletions
|
@ -312,7 +312,7 @@ pub fn finalize_session_directory(sess: &Session, svh: Option<Svh>) {
|
|||
|
||||
let incr_comp_session_dir: PathBuf = sess.incr_comp_session_dir().clone();
|
||||
|
||||
if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
|
||||
if sess.dcx().has_errors_or_lint_errors_or_delayed_bugs().is_some() {
|
||||
// If there have been any errors during compilation, we don't want to
|
||||
// publish this session directory. Rather, we'll just delete it.
|
||||
|
||||
|
|
|
@ -31,8 +31,8 @@ pub fn save_dep_graph(tcx: TyCtxt<'_>) {
|
|||
if sess.opts.incremental.is_none() {
|
||||
return;
|
||||
}
|
||||
// This is going to be deleted in finalize_session_directory, so let's not create it
|
||||
if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
|
||||
// This is going to be deleted in finalize_session_directory, so let's not create it.
|
||||
if sess.dcx().has_errors_or_lint_errors_or_delayed_bugs().is_some() {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -87,7 +87,7 @@ pub fn save_work_product_index(
|
|||
return;
|
||||
}
|
||||
// This is going to be deleted in finalize_session_directory, so let's not create it
|
||||
if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
|
||||
if sess.dcx().has_errors_or_lint_errors().is_some() {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue