Unify region variables when projecting associated types#73452
Merged
bors merged 3 commits intorust-lang:masterfrom Jun 20, 2020
Merged
Unify region variables when projecting associated types#73452bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
This is required to avoid cycles when evaluating auto trait predicates.
rust-highfive
added
the
S-waiting-on-review
Contributor
Author
|
@bors try @rust-timer queue |
Collaborator
|
Awaiting bors try build completion |
Collaborator
|
⌛ Trying commit ba2ef58 with merge 1f5caa606e035dcb2a87c8910a53d6f63b2e9eee... |
Collaborator
|
☀️ Try build successful - checks-azure |
Collaborator
|
Queued 1f5caa606e035dcb2a87c8910a53d6f63b2e9eee with parent 2935d29, future comparison URL. |
Collaborator
|
Finished benchmarking try commit (1f5caa606e035dcb2a87c8910a53d6f63b2e9eee): comparison url. |
nikomatsakis
approved these changes
Jun 18, 2020
| let r = if vid == resolved_vid { | ||
| r | ||
| } else { | ||
| self.tcx.mk_region(ty::ReVar(resolved_vid)) |
Contributor
There was a problem hiding this comment.
Nit: can we refactor with a helper like
self.tcx.reuse_or_mk_region(r, ty::ReVar(resolved_vid))I guess it wouldn't be quite as fast. I'd like to see that pattern used in more places, though.
Contributor
|
r=me with or without nit |
Merged
Contributor
Author
|
@bors r=nikomatsakis |
Collaborator
|
📌 Commit aa11704 has been approved by |
bors
added
S-waiting-on-bors
nikomatsakis
approved these changes
Jun 19, 2020
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2020
…arth Rollup of 16 pull requests Successful merges: - rust-lang#71420 (Specialization is unsound) - rust-lang#71899 (Refactor `try_find` a little) - rust-lang#72689 (add str to common types) - rust-lang#72791 (update coerce docs and unify relevant tests) - rust-lang#72934 (forbid mutable references in all constant contexts except for const-fns) - rust-lang#73027 (Make `need_type_info_err` more conservative) - rust-lang#73347 (Diagnose use of incompatible sanitizers) - rust-lang#73359 (shim.rs: avoid creating `Call` terminators calling `Self`) - rust-lang#73399 (Clean up E0668 explanation) - rust-lang#73436 (Clean up E0670 explanation) - rust-lang#73440 (Add src/librustdoc as an alias for src/tools/rustdoc) - rust-lang#73442 (pretty/mir: const value enums with no variants) - rust-lang#73452 (Unify region variables when projecting associated types) - rust-lang#73458 (Use alloc::Layout in DroplessArena API) - rust-lang#73484 (Update the doc for std::prelude to the correct behavior) - rust-lang#73506 (Bump Rustfmt and RLS) Failed merges: r? @ghost
rustbot
added
the
beta-accepted
spastorino
removed
the
beta-accepted
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 20, 2020
…ion-error, r=nikomatsakis Don't immediately error for cycles during normalization rust-lang#73452 meant some normalization cycles could be detected earlier, breaking some code. This PR makes defers errors for normalization cycles to fulfillment, fixing said code. Fixes rust-lang#74868 r? @nikomatsakis
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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 is required to avoid cycles when evaluating auto trait predicates.
Notably, this is required to be able add Chalk types to
CtxtInternersforcfg(parallel_compiler).r? @nikomatsakis