Only look for param in item's generics if it actually comes from generics#108554
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 1, 2023
Merged
Conversation
Collaborator
|
r? @oli-obk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler-errors
commented
Feb 28, 2023
| let ident = Ident::from_str_and_span(&pprust::ty_to_string(t), span); | ||
| let (param, bounds, path) = | ||
| self.lower_generic_and_bounds(*def_node_id, span, ident, bounds); | ||
| let (param, bounds, path) = self.lower_universal_param_and_bounds( |
Contributor
Author
There was a problem hiding this comment.
Drive-by nitpick rename of this fn, because we only use it for AFIT. Can revert if desired.
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Feb 28, 2023
…default, r=oli-obk Only look for param in item's generics if it actually comes from generics Record whether a `hir::GenericParam` comes from an item's generics, or from a `for<...>` binder. Then, only look for the param in `object_lifetime_default` if it actually comes from the item's generics. Fixes rust-lang#108177
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 28, 2023
…default, r=oli-obk Only look for param in item's generics if it actually comes from generics Record whether a `hir::GenericParam` comes from an item's generics, or from a `for<...>` binder. Then, only look for the param in `object_lifetime_default` if it actually comes from the item's generics. Fixes rust-lang#108177
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 1, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#108297 (Exit when there are unmatched delims to avoid noisy diagnostics) - rust-lang#108531 (rustdoc: Show that repeated expression arrays can be made with constant values) - rust-lang#108536 (Update books) - rust-lang#108550 (Remove the `capture_disjoint_fields` feature) - rust-lang#108551 (Descriptive error when users try to combine RPITIT/AFIT with specialization) - rust-lang#108554 (Only look for param in item's generics if it actually comes from generics) - rust-lang#108555 (Fix a race in the query system) - rust-lang#108558 (add missing feature in core/tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
4 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.
Record whether a
hir::GenericParamcomes from an item's generics, or from afor<...>binder. Then, only look for the param inobject_lifetime_defaultif it actually comes from the item's generics.Fixes #108177