Cherry-picking PR 24553 into [beta] #24941
Closed
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
table, introduce a `FreeRegionMap` data structure. regionck computes the `FreeRegionMap` for each fn and stores the result into the tcx so that borrowck can use it (this could perhaps be refactored to have borrowck recompute the map, but it's a bid tedious to recompute due to the interaction of closures and free fns). The main reason to do this is because of rust-lang#22779 -- using a global table was incorrect because when validating impl method signatures, we want to use the free region relationships from the *trait*, not the impl. Fixes rust-lang#22779. ---- This is cherry-pick of commit 6dfeda7 from PR rust-lang#24553 Manually resolved conflicts in: src/librustc/lib.rs src/librustc/middle/infer/region_inference/mod.rs (both conflicts were related to changes to file structure.)
This is a cherry-pick of commit 55ffd2e from PR rust-lang#24553
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: try (I am just curious whether bors can be used in this manner to give these cherry-picks to beta a whirl.) Update: from the "Merge conflict", I infer that I should instead push to the try branch, rather than using the try request-command to bors. ... or wait, even github says there is a merge conflict right now? That's weird, I thought I was working off the latest beta branch ...) |
|
🔒 Merge conflict |
This was referenced Apr 29, 2015
Closed
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.
This PR is a cherry-pick of PR #24553, which has gone through the beta-nomination and beta-acceptance process. (It just missed being part of the mass cherry-pick in #24708 because I had not yet reviewed it at that time.)
It should not be marked with the usual bors commands (i.e. no "r+" messages to at-bors); it instead will be merged manually after I had double checked that it builds locally.