Skip to content

Minor tweaks to compare_impl_item.rs - #131979

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:compare-pred-entail
Oct 24, 2024
Merged

Minor tweaks to compare_impl_item.rs#131979
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:compare-pred-entail

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Oct 20, 2024

Copy link
Copy Markdown
Contributor
  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.

@rustbot

rustbot commented Oct 20, 2024

Copy link
Copy Markdown
Collaborator

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Oct 20, 2024
@compiler-errorscompiler-errors changed the title Compare pred entailMinor tweaks to compare_impl_item.rsOct 20, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
compiler-errors
compiler-errors commented Oct 20, 2024
View reviewed changes
Comment threadcompiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs Outdated
fmease
fmease approved these changes Oct 22, 2024
View reviewed changes

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs
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(

@fmeasefmeaseOct 22, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(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

@compiler-errorscompiler-errorsOct 23, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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...

@compiler-errorscompiler-errorsOct 23, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@fmeasefmeaseOct 23, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, makes sense

Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs
Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs
Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/compare_impl_item.rs
@fmeasefmease assigned fmease and unassigned estebankOct 22, 2024
@fmeasefmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 22, 2024
@compiler-errors

compiler-errors commented Oct 23, 2024

Copy link
Copy Markdown
ContributorAuthor

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2024
@fmease

fmease commented Oct 23, 2024

Copy link
Copy Markdown
Member

Makes sense, thanks!
@bors r+ rollup

@bors

bors commented Oct 23, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 21d95fb has been approved by fmease

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 23, 2024
fmease added a commit to fmease/rust that referenced this pull request Oct 23, 2024
@fmease
Rollup merge ofrust-lang#131979- compiler-errors:compare-pred-entai…
d109024
…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`.
@fmeasefmease mentioned this pull request Oct 23, 2024
Closed
fmease added a commit to fmease/rust that referenced this pull request Oct 23, 2024
@fmease
Rollup merge ofrust-lang#131979- compiler-errors:compare-pred-entai…
e035413
…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`.
@fmeasefmease mentioned this pull request Oct 23, 2024
Closed
fmease added a commit to fmease/rust that referenced this pull request Oct 23, 2024
@fmease
Rollup merge ofrust-lang#131979- compiler-errors:compare-pred-entai…
01dfdae
…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`.
@fmeasefmease mentioned this pull request Oct 23, 2024
Closed
@fmeasefmease mentioned this pull request Oct 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 23, 2024
@bors
Auto merge ofrust-lang#132079- fmease:rollup-agrd358, r=fmease
b8bb296
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
@bors
bors merged commit 6b70ff4 into rust-lang:masterOct 24, 2024
@rustbotrustbot added this to the 1.84.0 milestone Oct 24, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 24, 2024
@rust-timer
Unrolled build forrust-lang#131979
8283c3a
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`.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmeasefmeasefmease approved these changes

Assignees

@fmeasefmease

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.84.0

Development

Successfully merging this pull request may close these issues.

6 participants

@compiler-errors@rustbot@rust-log-analyzer@fmease@bors@estebank