Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less #104554

BoxyUwU · 2022-11-17T21:22:18Z

there are only like 3 or 4 call sites left after this but it wasnt obvious to me how to remove them

rustbot · 2022-11-17T21:22:24Z

(rustbot has picked a reviewer for you, use r? to override)

compiler-errors · 2022-11-17T21:35:41Z

eddyb

Thanks a lot! This is very nice, just had some nitpicking (and a potentially scary pre-existing incremental unsoundness?).

compiler/rustc_infer/src/infer/mod.rs

eddyb · 2022-11-17T21:33:48Z

compiler/rustc_infer/src/infer/mod.rs

@@ -1218,9 +1218,13 @@ impl<'tcx> InferCtxt<'tcx> {
        );

        if self.tcx.sess.err_count() > self.err_count_on_creation {


Oh dear, this is causally flawed... nowadays we can have multiple InferCtxts alive at the same time (for different query instances on the stack, that depend on eachother).

The delay_span_bug should never cause an issue here but... err_count_on_creation could cause incremental unsoundness due to errors produced elsewhere in the system.

At the very least this kind of thing needs far more clever logic to save/restore counts/deltas when entering/exiting InferCtxts and I'm not even sure it's worth it... (cc @jackh726 @nikomatsakis).

i thought we don't cache anything on disc if there are any errors during this compilation session? 🤔

compiler/rustc_infer/src/infer/mod.rs

compiler/rustc_borrowck/src/lib.rs

compiler-errors · 2022-11-17T21:47:23Z

r? @eddyb 😸

BoxyUwU · 2022-11-17T22:43:39Z

src/test/ui/issues/issue-52262.rs

@@ -1,4 +1,3 @@
-// compile-flags:-Ztreat-err-as-bug=5


I uh ???? :(

lcnr

nits, then r=me

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

lcnr · 2022-11-18T12:12:42Z

@bors r+ rollup

bors · 2022-11-18T12:12:44Z

📌 Commit 72d1c77025b949548207dd264b6b95e3ae6ed071 has been approved by lcnr

It is now in the queue for this repository.

lcnr · 2022-11-18T12:13:39Z

@bors r- waiting for ci

BoxyUwU · 2022-11-18T13:11:43Z

@bors r=lcnr

bors · 2022-11-18T13:11:45Z

📌 Commit d80a9a2f887fcdc50d46589ce10a128e8ef1c8db has been approved by lcnr

It is now in the queue for this repository.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1) - rust-lang#103386 (Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting)) - rust-lang#103405 (Detect incorrect chaining of if and if let conditions and recover) - rust-lang#103594 (Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets) - rust-lang#104006 (Add variant_name function to `LangItem`) - rust-lang#104494 (Migrate GUI test to use functions) - rust-lang#104516 (rustdoc: clean up sidebar width CSS) - rust-lang#104550 (fix a typo) Failed merges: - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) r? `@ghost` `@rustbot` modify labels: rollup

BoxyUwU · 2022-11-19T00:12:44Z

@bors r=lcnr

bors · 2022-11-19T00:12:46Z

📌 Commit 45a09a4 has been approved by lcnr

It is now in the queue for this repository.

Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less there are only like 3 or 4 call sites left after this but it wasnt obvious to me how to remove them

Rollup of 8 pull requests Successful merges: - rust-lang#104001 (Improve generating Custom entry function) - rust-lang#104411 (nll: correctly deal with bivariance) - rust-lang#104528 (Properly link `{Once,Lazy}{Cell,Lock}` in docs) - rust-lang#104553 (Improve accuracy of asinh and acosh) - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) - rust-lang#104566 (couple of clippy::perf fixes) - rust-lang#104575 (deduplicate tests) - rust-lang#104580 (diagnostics: only show one suggestion for method -> assoc fn) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1) - rust-lang#103386 (Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting)) - rust-lang#103405 (Detect incorrect chaining of if and if let conditions and recover) - rust-lang#103594 (Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets) - rust-lang#104006 (Add variant_name function to `LangItem`) - rust-lang#104494 (Migrate GUI test to use functions) - rust-lang#104516 (rustdoc: clean up sidebar width CSS) - rust-lang#104550 (fix a typo) Failed merges: - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned TaKO8Ki Nov 17, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 17, 2022

rustbot assigned compiler-errors and unassigned TaKO8Ki Nov 17, 2022

eddyb approved these changes Nov 17, 2022

View reviewed changes

compiler-errors reviewed Nov 17, 2022

View reviewed changes

compiler/rustc_borrowck/src/lib.rs Outdated Show resolved Hide resolved

rustbot assigned eddyb and unassigned compiler-errors Nov 17, 2022

BoxyUwU force-pushed the less_unchecked_pls branch 2 times, most recently from 0b9224f to 5db72a4 Compare November 17, 2022 22:43

BoxyUwU commented Nov 17, 2022

View reviewed changes

src/test/ui/issues/issue-52262.rs

@@ -1,4 +1,3 @@

// compile-flags:-Ztreat-err-as-bug=5

Copy link

Member Author

BoxyUwU Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I uh ???? :(

BoxyUwU force-pushed the less_unchecked_pls branch 2 times, most recently from 714fb1e to df3625f Compare November 18, 2022 11:57

lcnr reviewed Nov 18, 2022

View reviewed changes

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs Outdated Show resolved Hide resolved

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2022

BoxyUwU force-pushed the less_unchecked_pls branch from 72d1c77 to d80a9a2 Compare November 18, 2022 12:36

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 18, 2022

matthiaskrgr mentioned this pull request Nov 18, 2022

Rollup of 8 pull requests #104573

Merged

BoxyUwU added 6 commits November 18, 2022 13:25

dont unchecked create ErrorGuaranteed in BorrowckErrors

c1ec8ff

InferCtxt::is_tainted_by_errors returns ErrorGuaranteed

9c51004

make replaced_with_error store ErrorGuaranteed

95a267b

track_errors use a delay_span_bug

3fca95a

rename is_tainted_by_errors

1c48039

require an ErrorGuaranteed to taint infcx with errors

9ed3483

BoxyUwU force-pushed the less_unchecked_pls branch 2 times, most recently from b6ba1e0 to c712ed1 Compare November 18, 2022 13:43

review comments 2 electric boogalo

45a09a4

BoxyUwU force-pushed the less_unchecked_pls branch from c712ed1 to 45a09a4 Compare November 18, 2022 13:45

This was referenced Nov 19, 2022

Rollup of 8 pull requests #104599

Closed

Rollup of 8 pull requests #104600

Merged

bors merged commit 7f35493 into rust-lang:master Nov 19, 2022

rustbot added this to the 1.67.0 milestone Nov 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less #104554

Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less #104554

BoxyUwU commented Nov 17, 2022

rustbot commented Nov 17, 2022

compiler-errors commented Nov 17, 2022

eddyb left a comment

eddyb Nov 17, 2022

lcnr Nov 18, 2022

compiler-errors commented Nov 17, 2022

BoxyUwU Nov 17, 2022

lcnr left a comment

lcnr commented Nov 18, 2022

bors commented Nov 18, 2022

lcnr commented Nov 18, 2022

BoxyUwU commented Nov 18, 2022

bors commented Nov 18, 2022

BoxyUwU commented Nov 19, 2022

bors commented Nov 19, 2022

		@@ -1218,9 +1218,13 @@ impl<'tcx> InferCtxt<'tcx> {
		);

		if self.tcx.sess.err_count() > self.err_count_on_creation {

Use ErrorGuaranteed::unchecked_claim_error_was_emitted less #104554

Use ErrorGuaranteed::unchecked_claim_error_was_emitted less #104554

Conversation

BoxyUwU commented Nov 17, 2022

rustbot commented Nov 17, 2022

compiler-errors commented Nov 17, 2022

eddyb left a comment

Choose a reason for hiding this comment

eddyb Nov 17, 2022

Choose a reason for hiding this comment

lcnr Nov 18, 2022

Choose a reason for hiding this comment

compiler-errors commented Nov 17, 2022

BoxyUwU Nov 17, 2022

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

lcnr commented Nov 18, 2022

bors commented Nov 18, 2022

lcnr commented Nov 18, 2022

BoxyUwU commented Nov 18, 2022

bors commented Nov 18, 2022

BoxyUwU commented Nov 19, 2022

bors commented Nov 19, 2022

Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less #104554

Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less #104554