Implement `PartialEq` for all function pointers via a shim by oli-obk · Pull Request #108074 · rust-lang/rust

oli-obk · 2023-02-15T09:20:09Z

This allows comparing higher kinded function pointers, at least directly via PartialEq. == has too much magic to work with this.

We can implement this in libstd without needing a shim once #99531 lands

this unblocks #105750

r? types

rustbot · 2023-02-15T09:20:19Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @compiler-errors (or someone else) soon.

Please see the contribution instructions for more information.

rustbot · 2023-02-15T09:20:23Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

RalfJung · 2023-02-15T09:41:01Z

tests/ui/fn/fn-ptr-eq.rs

+
+    let x: fn(&'static ()) = foo;
+    let y: for<'a> fn(&'a ()) = foo;
+    x == y;


So it works if the RHS is higher-ranked, but not if the LHS is higher-ranked? That is odd...

that seems definitely fixable, but I think it's a preexisting issue of binary ops.

I assume this is related to this remark?

== has too much magic to work with this.

I don't think I understand what the magic is, I thought a == b was just PartialEq::eq(&a, &b)...

lcnr · 2023-02-15T09:42:03Z

compiler/rustc_mir_build/src/build/matches/test.rs

@@ -837,15 +837,9 @@ fn trait_method<'tcx>(
    method_name: Symbol,
    substs: impl IntoIterator<Item = impl Into<GenericArg<'tcx>>>,
 ) -> ConstantKind<'tcx> {


why does this not use lang_items?

rust-log-analyzer · 2023-02-15T13:51:24Z

The job x86_64-gnu-llvm-14 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Prepare all required actions
Getting action download info
Download action repository 'actions/checkout@v3' (SHA:ac593985615ec2ede58e132d2e21d2b1cbd6127c)
Download action repository 'rust-lang/simpleinfra@master' (SHA:7ea263296c702710d7fac3c6d5bccdb2895b4e79)
Complete job name: PR (x86_64-gnu-llvm-14, false, ubuntu-20.04-xl)
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: x86_64-gnu-llvm-14
---
......iii............................................................................... 14432/14462
..............................
failures:

---- [ui] tests/ui/fn/fn-ptr-eq-op.rs stdout ----

121    |      +++++++++++     +++++++++++
122 
122 
123 error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ()) {foo}`
-   --> $DIR/fn-ptr-eq-op.rs:32:9
+   --> $DIR/fn-ptr-eq-op.rs:31:9
126 LL |     foo == x;
126 LL |     foo == x;
127    |     --- ^^ - fn(&())
134    |        +++++++++++     +++++++++++
135 
136 error[E0308]: mismatched types
-   --> $DIR/fn-ptr-eq-op.rs:32:12
-   --> $DIR/fn-ptr-eq-op.rs:32:12
+   --> $DIR/fn-ptr-eq-op.rs:31:12
138    |
139 LL |     foo == x;
140    |            ^ expected fn item, found fn pointer


The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fn/fn-ptr-eq-op/fn-ptr-eq-op.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args fn/fn-ptr-eq-op.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/fn/fn-ptr-eq-op.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fn/fn-ptr-eq-op" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fn/fn-ptr-eq-op/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:6:7
   |
LL |     x == y; //~ ERROR: `==` cannot be applied
   |     - ^^ - fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     x(/* &() */) == y(/* &() */); //~ ERROR: `==` cannot be applied


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:10:7
   |
LL |     x == y; //~ ERROR: `==` cannot be applied
   |     - ^^ - fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     x(/* &() */) == y(/* &() */); //~ ERROR: `==` cannot be applied


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:14:7
   |
LL |     x == y; //~ ERROR: `==` cannot be applied
   |     - ^^ - fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     x(/* &() */) == y(/* &() */); //~ ERROR: `==` cannot be applied
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:18:7
   |
LL |     x == foo; //~ ERROR: `==` cannot be applied
   |     - ^^ --- fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     x(/* &() */) == foo(/* &() */); //~ ERROR: `==` cannot be applied


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:19:7
   |
LL |     y == foo; //~ ERROR: `==` cannot be applied
   |     - ^^ --- fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     y(/* &() */) == foo(/* &() */); //~ ERROR: `==` cannot be applied


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ()) {foo}`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:20:9
   |
LL |     foo == x; //~ ERROR: `==` cannot be applied
   |     --- ^^ - for<'a> fn(&'a ())
   |     |
   |     for<'a> fn(&'a ()) {foo}
help: use parentheses to call these
   |
   |
LL |     foo(/* &() */) == x(/* &() */); //~ ERROR: `==` cannot be applied

error[E0308]: mismatched types
error[E0308]: mismatched types
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:20:12
   |
LL |     foo == x; //~ ERROR: `==` cannot be applied
   |            ^ expected fn item, found fn pointer
   |
   = note: expected fn item `for<'a> fn(&'a ()) {foo}`
           found fn pointer `for<'a> fn(&'a ())`

error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ()) {foo}`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:22:9
   |
LL |     foo == y; //~ ERROR: `==` cannot be applied
   |     --- ^^ - for<'a> fn(&'a ())
   |     |
   |     for<'a> fn(&'a ()) {foo}
help: use parentheses to call these
   |
   |
LL |     foo(/* &() */) == y(/* &() */); //~ ERROR: `==` cannot be applied

error[E0308]: mismatched types
error[E0308]: mismatched types
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:22:12
   |
LL |     foo == y; //~ ERROR: `==` cannot be applied
   |            ^ expected fn item, found fn pointer
   |
   = note: expected fn item `for<'a> fn(&'a ()) {foo}`
           found fn pointer `for<'a> fn(&'a ())`

error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ())`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:27:7
   |
LL |     x == y; //~ ERROR: `==` cannot be applied
   |     - ^^ - fn(&())
   |     |
   |     for<'a> fn(&'a ())
help: use parentheses to call these
   |
   |
LL |     x(/* &() */) == y(/* &() */); //~ ERROR: `==` cannot be applied


error[E0369]: binary operation `==` cannot be applied to type `for<'a> fn(&'a ()) {foo}`
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:31:9
   |
LL |     foo == x; //~ ERROR: `==` cannot be applied
   |     --- ^^ - fn(&())
   |     |
   |     for<'a> fn(&'a ()) {foo}
help: use parentheses to call these
   |
   |
LL |     foo(/* &() */) == x(/* &() */); //~ ERROR: `==` cannot be applied

error[E0308]: mismatched types
error[E0308]: mismatched types
  --> fake-test-src-base/fn/fn-ptr-eq-op.rs:31:12
   |
LL |     foo == x; //~ ERROR: `==` cannot be applied
   |            ^ expected fn item, found fn pointer
   |
   = note: expected fn item `for<'a> fn(&'a ()) {foo}`
           found fn pointer `fn(&())`
error: aborting due to 12 previous errors

Some errors have detailed explanations: E0308, E0369.
For more information about an error, try `rustc --explain E0308`.

compiler-errors · 2023-03-01T05:10:09Z

@rustbot author

oli-obk · 2023-03-28T07:52:19Z

closing in favor of #108080

oli-obk added 4 commits February 15, 2023 08:45

Make trait method lookup reusable

7872690

Fix a format string to actually use formatting

a1300b5

Implement PartialEq for all function pointers via a shim

ddbf749

Add tests showing new and remaining behaviour

ad4a76b

rustbot assigned compiler-errors Feb 15, 2023

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 Feb 15, 2023

RalfJung reviewed Feb 15, 2023

View reviewed changes

lcnr reviewed Feb 15, 2023

View reviewed changes

rustbot 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 Mar 1, 2023

oli-obk closed this Mar 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implement `PartialEq` for all function pointers via a shim#108074

Implement `PartialEq` for all function pointers via a shim#108074
oli-obk wants to merge 4 commits intorust-lang:masterfrom
oli-obk:builtin_eq

oli-obk commented Feb 15, 2023

Uh oh!

rustbot commented Feb 15, 2023

Uh oh!

rustbot commented Feb 15, 2023

Uh oh!

RalfJung Feb 15, 2023

Uh oh!

oli-obk Feb 15, 2023

Uh oh!

RalfJung Feb 15, 2023 •

edited

Loading

Uh oh!

lcnr Feb 15, 2023

Uh oh!

rust-log-analyzer commented Feb 15, 2023

Uh oh!

compiler-errors commented Mar 1, 2023

Uh oh!

oli-obk commented Mar 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

oli-obk commented Feb 15, 2023

Uh oh!

rustbot commented Feb 15, 2023

Uh oh!

rustbot commented Feb 15, 2023

Uh oh!

RalfJung Feb 15, 2023

Choose a reason for hiding this comment

Uh oh!

oli-obk Feb 15, 2023

Choose a reason for hiding this comment

Uh oh!

RalfJung Feb 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lcnr Feb 15, 2023

Choose a reason for hiding this comment

Uh oh!

rust-log-analyzer commented Feb 15, 2023

Uh oh!

compiler-errors commented Mar 1, 2023

Uh oh!

oli-obk commented Mar 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

RalfJung Feb 15, 2023 •

edited

Loading