Minor tweaks to compare_impl_item.rs#131979
Merged
bors merged 2 commits intorust-lang:masterfrom Oct 24, 2024
Merged
Conversation
Collaborator
compare_impl_item.rs
This comment has been minimized.
This comment has been minimized.
compiler-errors
commented
Oct 20, 2024
compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs
Outdated
Show resolved
Hide resolved
a844b11 to
7daa9f2
Compare
fmease
approved these changes
Oct 22, 2024
Member
fmease
left a comment
There was a problem hiding this comment.
6/7 suggestions are for preexisting warts. Would be cool if you could incorporate them in this PR but it's not a must :^).
otherwise r=me
| let trait_to_placeholder_args = | ||
| impl_to_placeholder_args.rebase_onto(tcx, impl_m.container_id(tcx), trait_to_impl_args); | ||
| debug!("compare_impl_method: trait_to_placeholder_args={:?}", trait_to_placeholder_args); | ||
| let trait_to_impl_args = GenericArgs::identity_for_item(tcx, impl_m.def_id).rebase_onto( |
Member
There was a problem hiding this comment.
(preexisting) wouldn't impl_m_args or impl_item_args be a better fit over trait_to_impl_args? the trait args aren't actually involved
Contributor
Author
There was a problem hiding this comment.
I think that would be confusing because after this renaming, we'd be instantiating impl_m_predicates with identity args, and trait_m_predicates with impl_m_args...
Contributor
Author
There was a problem hiding this comment.
I frankly think that trait_to_impl args is the right name; it's the set of arguments being used to map things parameterized over the trait method's args to the impl method.
7daa9f2 to
21d95fb
Compare
Contributor
Author
|
I don't agree with the name change, so I haven't addressed it. I changed a bunch of debugs with their more tracing-native variants. @rustbot ready |
Member
|
Makes sense, thanks! |
Collaborator
fmease
added a commit
to fmease/rust
that referenced
this pull request
Oct 23, 2024
…l, r=fmease Minor tweaks to `compare_impl_item.rs` 1. Stop using the `InstantiatedPredicates` struct for `hybrid_preds` in `compare_impl_item.rs`, since we never actually push anything into the `spans` part of it. 2. Remove redundant impl args and don't do useless identity substitution, prefer calling `instantiate_identity`.
fmease
added a commit
to fmease/rust
that referenced
this pull request
Oct 23, 2024
…l, r=fmease Minor tweaks to `compare_impl_item.rs` 1. Stop using the `InstantiatedPredicates` struct for `hybrid_preds` in `compare_impl_item.rs`, since we never actually push anything into the `spans` part of it. 2. Remove redundant impl args and don't do useless identity substitution, prefer calling `instantiate_identity`.
fmease
added a commit
to fmease/rust
that referenced
this pull request
Oct 23, 2024
…l, r=fmease Minor tweaks to `compare_impl_item.rs` 1. Stop using the `InstantiatedPredicates` struct for `hybrid_preds` in `compare_impl_item.rs`, since we never actually push anything into the `spans` part of it. 2. Remove redundant impl args and don't do useless identity substitution, prefer calling `instantiate_identity`.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 23, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#130991 (Vectorized SliceContains) - rust-lang#131928 (rustdoc: Document `markdown` module.) - rust-lang#131955 (Set `signext` or `zeroext` for integer arguments on RISC-V and LoongArch64) - rust-lang#131979 (Minor tweaks to `compare_impl_item.rs`) - rust-lang#132036 (Add a test case for rust-lang#131164) - rust-lang#132039 (Specialize `read_exact` and `read_buf_exact` for `VecDeque`) - rust-lang#132060 ("innermost", "outermost", "leftmost", and "rightmost" don't need hyphens) - rust-lang#132065 (Clarify documentation of `ptr::dangling()` function) - rust-lang#132066 (Fix a typo in documentation of `pointer::sub_ptr()`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 24, 2024
Rollup merge of rust-lang#131979 - compiler-errors:compare-pred-entail, r=fmease Minor tweaks to `compare_impl_item.rs` 1. Stop using the `InstantiatedPredicates` struct for `hybrid_preds` in `compare_impl_item.rs`, since we never actually push anything into the `spans` part of it. 2. Remove redundant impl args and don't do useless identity substitution, prefer calling `instantiate_identity`.
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
6 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.
InstantiatedPredicatesstruct forhybrid_predsincompare_impl_item.rs, since we never actually push anything into thespanspart of it.instantiate_identity.