Skip to content

Some compare_method tweaks#106129

Merged
bors merged 5 commits into
rust-lang:masterfrom
compiler-errors:compare_method-tweaks
Dec 28, 2022
Merged

Some compare_method tweaks#106129
bors merged 5 commits into
rust-lang:masterfrom
compiler-errors:compare_method-tweaks

Conversation

@compiler-errors

@compiler-errors compiler-errors commented Dec 24, 2022

Copy link
Copy Markdown
Contributor
  1. Make some of the comparison functions' names more regular
  2. Reduce pub scope of some of the things in compare_method
    3. Remove some unnecessary opaque type handling code -- InferCtxt already is in a mode that doesn't define opaque types
  • moved to a different PR
  1. Bubble up ErrorGuaranteed for region constraint errors in compare_method - Improves a redundant error message in one unit test.
  2. Move the compare_method module to have a more general name, since it's more like compare_impl_item :)
  3. Rename collect_trait_impl_trait_tys

@rustbot

rustbot commented Dec 24, 2022

Copy link
Copy Markdown
Collaborator

r? @Nilstrieb

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot 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. labels Dec 24, 2022
LL | type B<'a, 'b> = (&'a(), &'b ()) where 'b: 'a;
| ^^ impl has extra requirement `'b: 'a`

error[E0478]: lifetime bound not satisfied

@compiler-errors compiler-errors Dec 24, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This error is now not emitted since we return ErrorGuaranteed in compare_type_predicate_entailment, which means we never get to check_type_bounds which is where this error is reported.

@Noratrieb

Copy link
Copy Markdown
Member

The changes look good but I'm not familiar with the code so I'll r? types for further review.

@rustbot rustbot assigned oli-obk and unassigned Noratrieb Dec 27, 2022
@BoxyUwU

BoxyUwU commented Dec 28, 2022

Copy link
Copy Markdown
Member

@bors r+

nice to see my FIXME get FIXME'd

@bors

bors commented Dec 28, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 96d8011 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors bors 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 Dec 28, 2022
@BoxyUwU BoxyUwU assigned BoxyUwU and unassigned oli-obk Dec 28, 2022
@bors

bors commented Dec 28, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 96d8011 with merge 83a28ef...

@bors

bors commented Dec 28, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 83a28ef to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 28, 2022
@bors bors merged commit 83a28ef into rust-lang:master Dec 28, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 28, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (83a28ef): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
-1.6% [-2.3%, -0.6%] 3
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@compiler-errors compiler-errors deleted the compare_method-tweaks branch December 28, 2022 18:44
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 29, 2022
…n-err, r=estebank

Make trait/impl `where` clause mismatch on region error a bit more actionable

Improve `where` clause suggestions for GATs/methods that have incompatible region predicates in their `where` clauses.

Also addresses this diagnostic that went away rust-lang#106129 (comment)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 29, 2022
…n-err, r=estebank

Make trait/impl `where` clause mismatch on region error a bit more actionable

Improve `where` clause suggestions for GATs/methods that have incompatible region predicates in their `where` clauses.

Also addresses this diagnostic that went away rust-lang#106129 (comment)
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…s, r=BoxyUwU

Some `compare_method` tweaks

1. Make some of the comparison functions' names more regular
2. Reduce pub scope of some of the things in `compare_method`
~3. Remove some unnecessary opaque type handling code -- `InferCtxt` already is in a mode that doesn't define opaque types~
  * moved to a different PR
4. Bubble up `ErrorGuaranteed` for region constraint errors in `compare_method` - Improves a redundant error message in one unit test.
5. Move the `compare_method` module to have a more general name, since it's more like `compare_impl_item` :)
6. Rename `collect_trait_impl_trait_tys`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants