Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Fix const_fn_trait_ref_impl, add test for it #104113

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Fix const_fn_trait_ref_impl, add test for it #104113

merged 2 commits into from
Nov 9, 2022

Conversation

onestacked
Copy link
Contributor

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

r? @fee1-dead

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

rustbot commented Nov 7, 2022

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

@onestacked onestacked mentioned this pull request Nov 7, 2022
Merged
@compiler-errors
Copy link
Member

Whoops, thanks.

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 7, 2022

📌 Commit 0c9896b has been approved by compiler-errors

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

Actaully, one nit

@bors r-

@bors bors 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
@onestacked
Copy link
Contributor Author

onestacked commented Nov 7, 2022 •
edited
Loading

Whoops, thanks.

I should probably have had a test in my original PR

onestacked
onestacked commented Nov 7, 2022
View reviewed changes
src/test/ui/consts/fn_trait_refs.rs
};

// FIXME(const_cmp_tuple)
let test_one = test_fn(one);
Copy link
Contributor Author

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
Contributor Author

Choose a reason for hiding this comment

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

#104125

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 7, 2022

📌 Commit 87c190c has been approved by compiler-errors

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

onestacked commented Nov 7, 2022 •
edited
Loading

could probably be rollup=always

@onestacked onestacked mentioned this pull request Nov 7, 2022
Merged
@compiler-errors
Copy link
Member

@bors rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
@GuillaumeGomez
Rollup merge of rust-lang#104113 - ink-feather-org:fix_const_fn_ref_i…
fb78d9c 
…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 GuillaumeGomez mentioned this pull request Nov 8, 2022
Closed
@onestacked onestacked mentioned this pull request Nov 8, 2022
Closed
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 8, 2022
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2022
@GuillaumeGomez
Rollup merge of rust-lang#104113 - ink-feather-org:fix_const_fn_ref_i…
da9a8d8 
…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
@GuillaumeGomez
Rollup merge of rust-lang#104113 - ink-feather-org:fix_const_fn_ref_i…
6926c04 
…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 GuillaumeGomez mentioned this pull request Nov 8, 2022
Closed
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 8, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2022
@bors
Auto merge of rust-lang#104168 - GuillaumeGomez:rollup-tf4edqc, r=Gui…
8d36948 
…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:master Nov 9, 2022
@rustbot rustbot 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
@Dylan-DPC
Rollup merge of rust-lang#104125 - ink-feather-org:const_cmp_tuples, …
f89a485 
…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
@Dylan-DPC
Rollup merge of rust-lang#104125 - ink-feather-org:const_cmp_tuples, …
062f2fc 
…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
@Manishearth
Rollup merge of rust-lang#104125 - ink-feather-org:const_cmp_tuples, …
57d2005 
…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
@Dylan-DPC
Rollup merge of rust-lang#104125 - ink-feather-org:const_cmp_tuples, …
0729c1b 
…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``
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@fee1-dead fee1-dead

Labels
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
5 participants
@onestacked @rustbot @compiler-errors @bors @fee1-dead