Handle higher-rank lifetimes when generating type IDs #19821
Merged
Conversation
This file contains hidden or 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
| @@ -5780,128 +5780,162 @@ pub fn trait_item_of_item(tcx: &ctxt, def_id: ast::DefId) | |||
|
|
|||
| /// Creates a hash of the type `Ty` which will be the same no matter what crate | |||
| /// context it's calculated within. This is used by the `type_id` intrinsic. | |||
| pub fn hash_crate_independent(tcx: &ctxt, ty: Ty, svh: &Svh) -> u64 { | |||
| pub fn hash_crate_independent<'tcx>(tcx: &'tcx ctxt, ty: Ty<'tcx>, svh: &Svh) -> u64 { | |||
There was a problem hiding this comment.
This is wrong and I would expect it to cause terrible errors.
'tcx is the lifetime parameter of ctxt, not its lifetime - &ctxt<'tcx> to be precise.
bkoropoff
force-pushed
the
issue-19791
branch
from
8fbae02 to
0b9db9c
Compare
|
This looks awesome, thanks @bkoropoff! And especially thanks for the thorough tests :) |
|
My test also uncovered a small pretty printer bug. Bonus! |
|
r+ -- nice |
bkoropoff
force-pushed
the
issue-19791
branch
from
328ca1b to
ec10d6b
Compare
Normalize late-bound regions in bare functions, stack closures, and traits and include them in the generated hash. Closes rust-lang#19791
bkoropoff
force-pushed
the
issue-19791
branch
from
ec10d6b to
0a1798d
Compare
|
Rebased to resolve merge conflicts and hoisted Need r=nikomatsakis |
brson
added a commit
that referenced
this pull request
Dec 16, 2014
Normalize late-bound regions in bare functions, stack closures, and traits and include them in the generated hash. Closes #19791 r? @nikomatsakis (does my normalization make sense?) cc @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Dec 17, 2014
Normalize late-bound regions in bare functions, stack closures, and traits and include them in the generated hash. Closes rust-lang#19791 r? @nikomatsakis (does my normalization make sense?) cc @alexcrichton
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.
Normalize late-bound regions in bare functions, stack closures, and traits and include them in the generated hash.
Closes #19791
r? @nikomatsakis (does my normalization make sense?)
cc @alexcrichton