Skip to content

Constify cmp_min_max_by. #102245

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
Merged
merged 1 commit into from
Sep 25, 2022
Merged

Constify cmp_min_max_by. #102245

merged 1 commit into from
Sep 25, 2022

Conversation

onestacked
Copy link
Contributor

@onestacked onestacked commented Sep 24, 2022 •
edited
Loading

Constifies core::cmp::{min, max}_by[_key] behind the const_cmp #92391 feature gate, using const_closure.

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 24, 2022
@rustbot
Copy link
Collaborator

rustbot commented Sep 24, 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

@rust-highfive
Copy link
Contributor

r? @scottmcm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 24, 2022
@onestacked
Copy link
Contributor Author

r? @fee1-dead

@rust-highfive rust-highfive assigned fee1-dead and unassigned scottmcm Sep 24, 2022
@onestacked
Copy link
Contributor Author

@rustbot label +T-libs-api -T-libs

@rustbot rustbot added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. and removed T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Sep 24, 2022
@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 25, 2022

📌 Commit 2e7a201 has been approved by fee1-dead

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 Sep 25, 2022
This was referenced Sep 25, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 25, 2022
@bors
Auto merge of rust-lang#102265 - fee1-dead-contrib:rollup-a7fccbg, r=…
17e8752 
…fee1-dead

Rollup of 8 pull requests

Successful merges:

 - rust-lang#98111 (Clarify `[T]::select_nth_unstable*` return values)
 - rust-lang#101431 (Look at move place's type when suggesting mutable reborrow)
 - rust-lang#101800 (Constify slice.split_at_mut(_unchecked))
 - rust-lang#101997 (Remove support for legacy PM)
 - rust-lang#102194 (Note the type when unable to drop values in compile time)
 - rust-lang#102200 (Constify Default impl's for Arrays and Tuples.)
 - rust-lang#102245 (Constify cmp_min_max_by.)
 - rust-lang#102259 (Type-annotate and simplify documentation of Option::unwrap_or_default)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b00b918 into rust-lang:master Sep 25, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 25, 2022
fee1-dead
fee1-dead reviewed Sep 27, 2022
View reviewed changes
library/core/src/cmp.rs
pub const fn min_by<T, F: ~const FnOnce(&T, &T) -> Ordering>(v1: T, v2: T, compare: F) -> T
where
T: ~const Destruct,
F: ~const Destruct,
Copy link
Member

Choose a reason for hiding this comment

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

I don't think F needs to be dropped here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ohh right thats an FnOnce, will fix

Copy link
Member

Choose a reason for hiding this comment

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

I am fixing this in the const iterator PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok thanks!

@onestacked
Copy link
Contributor Author

@rustbot label +const-hack

@onestacked onestacked deleted the const_cmp_by branch November 2, 2022 22:42
@cuviper cuviper mentioned this pull request Mar 23, 2023
Closed
@oli-obk oli-obk mentioned this pull request Mar 31, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 31, 2023
@bors
Auto merge of rust-lang#109817 - oli-obk:revert_102245, r=pnkfelix
734f69d 
Revert 102245

reverts rust-lang#102245, but only on beta, as that caused rust-lang#109543 which has since been fixed on nightly.

This needed an additional partial revert of rust-lang@5b08c9f for changes that happened due to later cleanups.

I also added a test from the issue to make sure this actually fixes it 😆

r? `@wesleywiser` `@pnkfelix`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@fee1-dead fee1-dead fee1-dead 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-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.
6 participants
@onestacked @rustbot @rust-highfive @fee1-dead @bors @scottmcm