Skip to content

Fix const_fn_trait_ref_impl, add test for it - #104113

Merged
bors merged 2 commits into
rust-lang:masterfrom
ink-feather-org:fix_const_fn_ref_impls
Nov 9, 2022
Merged

Fix const_fn_trait_ref_impl, add test for it#104113
bors merged 2 commits into
rust-lang:masterfrom
ink-feather-org:fix_const_fn_ref_impls

Conversation

@onestacked

Copy link
Copy Markdown
Contributor

#99943 broke #[feature(const_fn_trait_ref_impl)], this PR fixes this and adds a test for it.

r? @fee1-dead

@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 7, 2022
@rustbot

Copy link
Copy Markdown
Collaborator

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@compiler-errors

Copy link
Copy Markdown
Contributor

Whoops, thanks.

@bors r+

@bors

bors commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 0c9896b has been approved by compiler-errors

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 Nov 7, 2022
@compiler-errors

Copy link
Copy Markdown
Contributor

Actaully, one nit

@bors r-

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 7, 2022
Comment threadsrc/test/ui/consts/fn_trait_refs.rs Outdated
@onestacked

onestacked commented Nov 7, 2022

Copy link
Copy Markdown
ContributorAuthor

Whoops, thanks.

I should probably have had a test in my original PR

};

// FIXME(const_cmp_tuple)
let test_one = test_fn(one);

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.

Working on a PR for this, will fix this in the pr that is merged last

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.

@compiler-errors

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 87c190c has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 7, 2022
@onestacked

onestacked commented Nov 7, 2022

Copy link
Copy Markdown
ContributorAuthor

could probably be rollup=always

@onestackedonestacked mentioned this pull request Nov 7, 2022
@compiler-errors

Copy link
Copy Markdown
Contributor

@bors rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
…mpls, r=compiler-errors
Fix `const_fn_trait_ref_impl`, add test for it
rust-lang#99943 broke `#[feature(const_fn_trait_ref_impl)]`, this PR fixes this and adds a test for it.
r? `@fee1-dead`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
…mpls, r=compiler-errors
Fix `const_fn_trait_ref_impl`, add test for it
rust-lang#99943 broke `#[feature(const_fn_trait_ref_impl)]`, this PR fixes this and adds a test for it.
r? ``@fee1-dead``
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
…mpls, r=compiler-errors
Fix `const_fn_trait_ref_impl`, add test for it
rust-lang#99943 broke `#[feature(const_fn_trait_ref_impl)]`, this PR fixes this and adds a test for it.
r? ```@fee1-dead```
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2022
…llaumeGomez
Rollup of 12 pull requests
Successful merges:
- rust-lang#103928 (Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed')
- rust-lang#104027 (Place config.toml in current working directory if config not found)
- rust-lang#104093 (disable btree size tests on Miri)
- rust-lang#104097 (run alloc benchmarks in Miri and fix UB)
- rust-lang#104104 (Add split-debuginfo print option)
- rust-lang#104109 (rustdoc: Add mutable to the description)
- rust-lang#104113 (Fix `const_fn_trait_ref_impl`, add test for it)
- rust-lang#104114 (Fix invalid background-image file name)
- rust-lang#104132 (fix: lint against lint functions)
- rust-lang#104139 (Clarify licensing situation of MPSC and SPSC queue)
- rust-lang#104147 (Remove an address comparison from the parser)
- rust-lang#104165 (Add llvm-main to triagebot.toml)
Failed merges:
- rust-lang#104115 (Migrate crate-search element to CSS variables)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 02db37a into rust-lang:masterNov 9, 2022
@rustbotrustbot added this to the 1.67.0 milestone Nov 9, 2022
@onestacked
onestacked deleted the fix_const_fn_ref_impls branch November 9, 2022 03:16
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Nov 9, 2022
…r=fee1-dead
Const Compare for Tuples
Makes the impls for Tuples of ~const `PartialEq` types also `PartialEq`, impls for Tuples of ~const `PartialOrd` types also `PartialOrd`, for Tuples of ~const `Ord` types also `Ord`.
behind the `#![feature(const_cmp)]` gate.
~~Do not merge before rust-lang#104113 is merged because I want to use this feature to clean up the new test that I added there.~~
r? `@fee1-dead`
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Nov 9, 2022
…r=fee1-dead
Const Compare for Tuples
Makes the impls for Tuples of ~const `PartialEq` types also `PartialEq`, impls for Tuples of ~const `PartialOrd` types also `PartialOrd`, for Tuples of ~const `Ord` types also `Ord`.
behind the `#![feature(const_cmp)]` gate.
~~Do not merge before rust-lang#104113 is merged because I want to use this feature to clean up the new test that I added there.~~
r? ``@fee1-dead``
Manishearth added a commit to Manishearth/rust that referenced this pull request Nov 9, 2022
…r=fee1-dead
Const Compare for Tuples
Makes the impls for Tuples of ~const `PartialEq` types also `PartialEq`, impls for Tuples of ~const `PartialOrd` types also `PartialOrd`, for Tuples of ~const `Ord` types also `Ord`.
behind the `#![feature(const_cmp)]` gate.
~~Do not merge before rust-lang#104113 is merged because I want to use this feature to clean up the new test that I added there.~~
r? ```@fee1-dead```
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…r=fee1-dead
Const Compare for Tuples
Makes the impls for Tuples of ~const `PartialEq` types also `PartialEq`, impls for Tuples of ~const `PartialOrd` types also `PartialOrd`, for Tuples of ~const `Ord` types also `Ord`.
behind the `#![feature(const_cmp)]` gate.
~~Do not merge before rust-lang#104113 is merged because I want to use this feature to clean up the new test that I added there.~~
r? ``@fee1-dead``
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

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.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@onestacked@rustbot@compiler-errors@bors@fee1-dead