rustc_typeck: consolidate adjustment composition #41279
Merged
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
nikomatsakis
approved these changes
Apr 13, 2017
|
@bors r+ Nice patch. |
|
📌 Commit 03b0d99 has been approved by |
|
⌛ Testing commit 03b0d99 with merge 8019dc0... |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Apr 14, 2017
…ikomatsakis rustc_typeck: consolidate adjustment composition Instead of having `write_adjustment` overwrite the previous adjustment, have `apply_adjustment` compose a new adjustment on top of the previous one. This is important because `NeverToAny` adjustments can be present on expressions during coercion. Fixes rust-lang#41213. r? @nikomatsakis
|
@bors retry prioritizing rollup |
Mark-Simulacrum
added
the
S-waiting-on-bors
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Apr 27, 2017
typeck: resolve type vars before calling `try_index_step` `try_index_step` does not resolve type variables by itself and would fail otherwise. Also harden the failure path in `confirm` to cause less confusing errors. r? @eddyb Fixes rust-lang#41498. beta-nominating because regression (caused by rust-lang#41279).
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Apr 27, 2017
typeck: resolve type vars before calling `try_index_step` `try_index_step` does not resolve type variables by itself and would fail otherwise. Also harden the failure path in `confirm` to cause less confusing errors. r? @eddyb Fixes rust-lang#41498. beta-nominating because regression (caused by rust-lang#41279).
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Apr 27, 2017
typeck: resolve type vars before calling `try_index_step` `try_index_step` does not resolve type variables by itself and would fail otherwise. Also harden the failure path in `confirm` to cause less confusing errors. r? @eddyb Fixes rust-lang#41498. beta-nominating because regression (caused by rust-lang#41279).
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.
Instead of having
write_adjustmentoverwrite the previous adjustment, haveapply_adjustmentcompose a new adjustment on top of the previous one. This is important becauseNeverToAnyadjustments can be present on expressions during coercion.Fixes #41213.
r? @nikomatsakis