Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move fallback_has_occurred state tracking to FnCtxt #103865

Merged

Conversation

compiler-errors
Copy link
Member

Removes a ton of callsites that defaulted to false

@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2022

r? @eholk

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

@rustbot 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 2, 2022
@@ -9,14 +9,14 @@ use rustc_middle::ty::{self, Ty};
impl<'tcx> FnCtxt<'_, 'tcx> {
/// Performs type inference fallback, returning true if any fallback
/// occurs.
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment is now outdated, same with fallback_if_possible below.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks 😃

@compiler-errors compiler-errors force-pushed the fallback-has-occurred-tracking branch from 93bda09 to af88b55 Compare November 3, 2022 02:59
@bors
Copy link
Contributor

bors commented Nov 5, 2022

☔ The latest upstream changes (presumably #103998) made this pull request unmergeable. Please resolve the merge conflicts.

@compiler-errors compiler-errors force-pushed the fallback-has-occurred-tracking branch from af88b55 to bc345d7 Compare November 6, 2022 02:41
@eholk
Copy link
Contributor

eholk commented Nov 7, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 7, 2022

📌 Commit bc345d7 has been approved by eholk

It is now in the queue for this repository.

@bors 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 7, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#103446 (Specialize `iter::ArrayChunks::fold` for TrustedRandomAccess iterators)
 - rust-lang#103651 (Fix `rustc_parse_format` spans following escaped utf-8 multibyte chars)
 - rust-lang#103865 (Move `fallback_has_occurred` state tracking to `FnCtxt`)
 - rust-lang#103955 (Update linker-plugin-lto.md to contain up to Rust 1.65)
 - rust-lang#103987 (Remove `in_tail_expr` from FnCtxt)
 - rust-lang#104067 (fix debuginfo for windows_gnullvm_base.rs)
 - rust-lang#104094 (fully move `on_unimplemented` to `error_reporting`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 77a44ab into rust-lang:master Nov 8, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 8, 2022
@compiler-errors compiler-errors deleted the fallback-has-occurred-tracking branch August 11, 2023 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants