Introduce a FreeRegionMap to store relations between free regions
#24553
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
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
r? @pnkfelix |
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.
nikomatsakis
force-pushed
the
issue-22779-overconstrained-impl
branch
from
8c41bc0
to
6dfeda7
Compare
nikomatsakis
added
the
beta-nominated
|
soundness fix; niko considers low-risk. going from nominated to (nominated, accepted) (and I need to get my butt going reviewing it.) |
pnkfelix
added
the
beta-accepted
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| //! This file defines |
There was a problem hiding this comment.
The file defines ... what? What? You leave me in suspense!
|
Okay, this all looks good. I had some nits about the comments but honestly I'd rather just try to land this now if possible. :) |
bors
added a commit
that referenced
this pull request
Apr 24, 2015
… r=pnkfelix Rather than storing the relations between free-regions in a global 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 #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 #22779.
|
💔 Test failed - auto-mac-32-opt |
|
|
@bors p=1 |
|
⌛ Testing commit 55ffd2e with merge f9e53c7... |
bors
added a commit
that referenced
this pull request
Apr 24, 2015
… r=pnkfelix Rather than storing the relations between free-regions in a global 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 #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 #22779.
pnkfelix
pushed a commit
to pnkfelix/rust
that referenced
this pull request
Apr 29, 2015
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.)
pnkfelix
pushed a commit
to pnkfelix/rust
that referenced
this pull request
Apr 29, 2015
This is a cherry-pick of commit 55ffd2e from PR rust-lang#24553
This was referenced Apr 29, 2015
Closed
pnkfelix
pushed a commit
to pnkfelix/rust
that referenced
this pull request
Apr 29, 2015
This is cherry-pick of commit 55ffd2e from PR rust-lang#24553
alexcrichton
added a commit
that referenced
this pull request
Apr 29, 2015
cherry-pick of PR #24553 to [beta]
alexcrichton
removed
the
beta-nominated
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.
Rather than storing the relations between free-regions in a global
table, introduce a
FreeRegionMapdata structure. regionck computes theFreeRegionMapfor each fn and stores the result into the tcx so thatborrowck 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 #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 #22779.