[WIP] Region vid newtype index #45906
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
When we get around to resolving regions, we really ought to take region obligations into account. There is one case where they are presently being ignored. Keep ignoring them there for now but leave a TODO.
This helps make its inputs and outputs more clear.
This new way is **slightly** less expressive (I would be shocked if it affects any code, though) when it comes to higher-ranked bounds or a few other weird tricks. But we don't handle those consistently regardless, and the new way does not require normalization and is just wildly simpler.
Instead, just search the param env predicates directly. This is equivalent to what we were doing before but more efficient.
Unquestionably there is more cleanup to be done, but I'm not sure what it should look like yet, so leaving it roughly as is.
Temporary make various fields public.
This way, we can `take()` ownership of it when we are going to resolve regions.
We are heading towards deeper integration with the region inference system in infcx; in particular, prior to the creation of the `RegionInferenceContext`, it will be the "owner" of the set of region variables.
We've kind of got the same information twice in the MIR, between the return-type field and the local-decls. Seems un-great.
The inference README, in particular, was VERY out of date!
This restores the behavior of regionck with respect to the free-region-map: that is, it collects all the relations from the fn and its closures. This feels a bit fishy but it's the behavior we've had for some time, and it will go away with NLL, so seems best to just keep it.
shepmaster
added
S-waiting-on-author
|
Auto-assigning to... r? @estebank |
|
Note the new policy on landing things for NLL -- basically, use the |
estebank
reviewed
Nov 10, 2017
There was a problem hiding this comment.
Looking only at cf7fe00, LGTM. Please resubmit the PR against https://github.com/nikomatsakis/rust/tree/nll-master
| @@ -16,7 +16,7 @@ use self::CombineMapType::*; | |||
| use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin}; | |||
| use super::unify_key; | |||
|
|
|||
| use rustc_data_structures::indexed_vec::IndexVec; | |||
| use rustc_data_structures::indexed_vec::{IndexVec, Idx}; | |||
There was a problem hiding this comment.
It's needed because methods of Idx trait are used
|
Done here nikomatsakis#11 |
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 SHOULD BE MERGED AFTER #45825 and probably after rebasing and force pushing :)
/cc @nikomatsakis