Don't try to add nested predicate to Rustdoc auto-trait ParamEnv
#80254
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
Fixes rust-lang#80233 We already have logic in `evaluate_predicates` that tries to add unimplemented predicates to our `ParamEnv`. Trying to add a predicate that already holds can lead to errors later on, since projection will prefer trait candidates from the `ParamEnv` to predicates from an impl.
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@estebank Are there any changes that you'd like me to make? |
|
@bors r+ |
|
📌 Commit f2d7c05 has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 15, 2021
…=estebank Don't try to add nested predicate to Rustdoc auto-trait `ParamEnv` Fixes rust-lang#80233 We already have logic in `evaluate_predicates` that tries to add unimplemented predicates to our `ParamEnv`. Trying to add a predicate that already holds can lead to errors later on, since projection will prefer trait candidates from the `ParamEnv` to predicates from an impl.
|
⌛ Testing commit f2d7c05 with merge 6be73f587b2ad18c09ecdc840d5495b8155d6ced... |
|
@bors retry rolledup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2021
Rollup of 5 pull requests Successful merges: - rust-lang#80254 (Don't try to add nested predicate to Rustdoc auto-trait `ParamEnv`) - rust-lang#80834 (Remove unreachable panics from VecDeque::{front/back}[_mut]) - rust-lang#80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`) - rust-lang#81008 (Don't ICE when computing a layout of a generator tainted by errors) - rust-lang#81023 (Remove doctree::Variant) Failed merges: - rust-lang#81033 (Remove useless `clean::Variant` struct) r? `@ghost` `@rustbot` modify labels: rollup
GuillaumeGomez
added
the
T-rustdoc
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.
Fixes #80233
We already have logic in
evaluate_predicatesthat tries to addunimplemented predicates to our
ParamEnv. Trying to add a predicatethat already holds can lead to errors later on, since projection
will prefer trait candidates from the
ParamEnvto predicates from animpl.