Fix cycle error when emitting suggestion for mismatched fn type
#69936
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes rust-lang#66667 Previously, we called `tcx.typeck_tables_of` when determining whether or not to emit a suggestion for a type error. However, we might already be type-checking the `DefId` we pass to `typeck_tables_of` (it could be anywhere in the query stack). Fortunately, we only need the function signature, not the entire `TypeckTables`. By using `tcx.fn_sig`, we avoid the possibility of cycle errors while retaining the ability to emit a suggestion.
|
r? @varkor (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit ff65bff has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#69644 (Remove framework in `dataflow/mod.rs` in favor of "generic" one) - rust-lang#69936 (Fix cycle error when emitting suggestion for mismatched `fn` type) - rust-lang#70048 (Allow obtaining &mut OsStr) - rust-lang#70344 (Decouple `rustc_hir::print` into `rustc_hir_pretty`) - rust-lang#70435 (Add regression test for rust-lang#66706) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #66667
Previously, we called
tcx.typeck_tables_ofwhen determining whether ornot to emit a suggestion for a type error. However, we might already be
type-checking the
DefIdwe pass totypeck_tables_of(it could beanywhere in the query stack).
Fortunately, we only need the function signature, not the entire
TypeckTables. By usingtcx.fn_sig, we avoid the possibility of cycleerrors while retaining the ability to emit a suggestion.