Skip to content

Actually taint InferCtxt when a fulfillment error is emitted - #126620

Merged
bors merged 4 commits into
rust-lang:masterfrom
oli-obk:taint_errors
Jun 20, 2024
Merged

Actually taint InferCtxt when a fulfillment error is emitted#126620
bors merged 4 commits into
rust-lang:masterfrom
oli-obk:taint_errors

Conversation

@oli-obk

@oli-obkoli-obk commented Jun 18, 2024

Copy link
Copy Markdown
Contributor

And avoid checking the global error counter

fixes#122044
fixes#123255
fixes#123276
fixes#125799

@rustbot

Copy link
Copy Markdown
Collaborator

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot 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 Jun 18, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@fee1-dead

Copy link
Copy Markdown
Member

Changes LGTM, will take another look after the outdated comment is updated/removed and CI green.

@oli-obk

Copy link
Copy Markdown
ContributorAuthor

Moved the tests from the crashes test suite to ui tests

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This test was removed without replacement, because it covers the same ICE as tests/ui/const-generics/mistyped_const_in_pat.rs

@rust-log-analyzer

This comment has been minimized.

@fee1-dead

Copy link
Copy Markdown
Member

@rustbot author

@rustbotrustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2024

@fee1-deadfee1-dead left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, had a potential improvement worth following up on

Comment on lines +7 to +11
note: required by a bound in `bar`
--> $DIR/unify_with_nested_expr.rs:14:10
--> $DIR/unify_with_nested_expr.rs:12:8
|
LL | fn bar<const N: usize>()
| --- required by a bound in this function
LL | where
LL | [(); N + 1]:,
| ^^^^^ required by this bound in `bar`
| ^^^^^^^^^^^^^^ required by this bound in `bar`

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wonder if it makes sense to call this a bound? Is it pointing to the span of ConstArgHasType? At least on the language level this is just a const generic parameter and not a bound.

@fee1-dead

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 19, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 1cb75dc has been approved by fee1-dead

It is now in the queue for this repository.

@borsbors 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 Jun 19, 2024
@oli-obk

Copy link
Copy Markdown
ContributorAuthor

I adjusted the wording without doing a deeper refactoring

@fee1-deadfee1-dead 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 Jun 19, 2024
…cause of the bound that binds the parameter's type
@oli-obk

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2024
@fee1-dead

Copy link
Copy Markdown
Member

r=me when green

@fee1-dead

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 19, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit e4c9a8c has been approved by fee1-dead

It is now in the queue for this repository.

@borsbors 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 Jun 19, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
Actually taint InferCtxt when a fulfillment error is emitted
And avoid checking the global error counter
fixesrust-lang#122044fixesrust-lang#123255fixesrust-lang#123276fixesrust-lang#125799
@jieyouxujieyouxu mentioned this pull request Jun 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Rollup of 7 pull requests
Successful merges:
- rust-lang#124807 (Migrate `run-make/rustdoc-io-error` to `rmake.rs`)
- rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
- rust-lang#126308 (Ban `ArrayToPointer` and `MutToConstPointer` from runtime MIR)
- rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
- rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
- rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
- rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)
r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
Actually taint InferCtxt when a fulfillment error is emitted
And avoid checking the global error counter
fixesrust-lang#122044fixesrust-lang#123255fixesrust-lang#123276fixesrust-lang#125799
@jieyouxujieyouxu mentioned this pull request Jun 19, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
Actually taint InferCtxt when a fulfillment error is emitted
And avoid checking the global error counter
fixesrust-lang#122044fixesrust-lang#123255fixesrust-lang#123276fixesrust-lang#125799
@jieyouxujieyouxu mentioned this pull request Jun 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
Rollup of 9 pull requests
Successful merges:
- rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
- rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)
- rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
- rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
- rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
- rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)
- rust-lang#126698 (Migrate `unknown-mod-stdin`, `issue-68794-textrel-on-minimal-lib`, `raw-dylib-cross-compilation` and `used-cdylib-macos` `run-make` tests to rmake)
- rust-lang#126703 (reword the hint::blackbox non-guarantees)
- rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
…iaskrgr
Rollup of 5 pull requests
Successful merges:
- rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
- rust-lang#126649 (Fix `feature = "nightly"` in the new trait solver)
- rust-lang#126652 (Clarify that anonymous consts still do introduce a new scope)
- rust-lang#126703 (reword the hint::blackbox non-guarantees)
- rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit e7be356 into rust-lang:masterJun 20, 2024
@rustbotrustbot added this to the 1.81.0 milestone Jun 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
Rollup merge of rust-lang#126620 - oli-obk:taint_errors, r=fee1-dead
Actually taint InferCtxt when a fulfillment error is emitted
And avoid checking the global error counter
fixesrust-lang#122044fixesrust-lang#123255fixesrust-lang#123276fixesrust-lang#125799
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

6 participants

@oli-obk@rustbot@rust-log-analyzer@fee1-dead@bors@compiler-errors