Skip to content

Stabilize is_none_or #129086

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 16, 2024
Merged

Stabilize is_none_or #129086

merged 2 commits into from
Aug 16, 2024

Conversation

slanterns
Copy link
Contributor

Closes: #126383.

@rustbot label: +T-libs-api

r? libs-api

@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 Aug 14, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 14, 2024

The Miri subtree was changed

cc @rust-lang/miri

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@rustbot rustbot added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Aug 14, 2024
lnicola
lnicola suggested changes Aug 14, 2024
View reviewed changes
Copy link
Member

@lnicola lnicola left a comment

Choose a reason for hiding this comment

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

Note that r-a still has to build on 1.80 and maybe a couple of older versions, so we can't start using is_none_or right now.

@slanterns
Copy link
Contributor Author

Right, I removed the changes on r-a.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lnicola
Copy link
Member

lnicola commented Aug 14, 2024 •
edited
Loading

I guess you'll need to change https://github.com/lnicola/rust-analyzer/blob/e37df4cd240d1bebbd61a0d2b5468ae7719a08c0/crates/hir-ty/src/display.rs#L1465 to IsNoneOr::is_none_or(default_parameters.get(i), ...).

@slanterns
Copy link
Contributor Author

slanterns commented Aug 14, 2024 •
edited
Loading

Yeah, we should force it to use IsNoneOr::is_none_or, otherwise it will prioritize the inherent implementation after the stabilization 🙂.
(I think it won't cause any real problem other than trigger the unused warning, though.)

@dtolnay dtolnay assigned dtolnay and unassigned m-ou-se Aug 16, 2024
@dtolnay dtolnay removed T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 16, 2024
dtolnay
dtolnay approved these changes Aug 16, 2024
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thank you!

@dtolnay
Copy link
Member

dtolnay commented Aug 16, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 16, 2024

📌 Commit 14ac0a3 has been approved by dtolnay

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 Aug 16, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 16, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2024
@bors
Auto merge of rust-lang#129162 - matthiaskrgr:rollup-r0oxdev, r=matth…
506052d 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#128990 (Re-enable more debuginfo tests on freebsd)
 - rust-lang#129042 (Special-case alias ty during the delayed bug emission in `try_from_lit`)
 - rust-lang#129086 (Stabilize `is_none_or`)
 - rust-lang#129149 (Migrate `validate_json.py` script to rust in `run-make/rustdoc-map-file` test)
 - rust-lang#129154 (Fix wrong source location for some incorrect macro definitions)
 - rust-lang#129161 (Stabilize std::thread::Builder::spawn_unchecked)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9d57e46 into rust-lang:master Aug 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2024
@rust-timer
Unrolled build for rust-lang#129086
2e5df4e 
Rollup merge of rust-lang#129086 - slanterns:is_none_or, r=dtolnay

Stabilize `is_none_or`

Closes: rust-lang#126383.

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

r? libs-api
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 16, 2024
Closed
@slanterns slanterns deleted the is_none_or branch August 17, 2024 01:59
@RalfJung
Copy link
Member

This is already merged but still shows up in the bors queue?
@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 Aug 17, 2024
@steffahn steffahn mentioned this pull request Sep 24, 2024
Closed
@apiraino
Copy link
Contributor

Unsure if this is the correct procedure but I'll label this to be mentioned in the release notes since #130575

@rustbot label +relnotes

@rustbot rustbot added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 25, 2024
@rustbot rustbot mentioned this pull request Sep 25, 2024
Closed
3 tasks
@vtamara vtamara mentioned this pull request Mar 3, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lnicola lnicola lnicola requested changes

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.

Tracking Issue for is_none_or
9 participants
@slanterns @rustbot @rust-log-analyzer @lnicola @dtolnay @bors @RalfJung @apiraino @m-ou-se