Skip to content
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

replace one .map_or(true, ...) with .is_none_or(...) #136664

Merged
merged 1 commit into from
Feb 7, 2025
Merged

replace one .map_or(true, ...) with .is_none_or(...) #136664

merged 1 commit into from
Feb 7, 2025

Conversation

WaffleLapkin
Copy link
Member

Randomly found while going through some of my old branches.

@rustbot
Copy link
Collaborator

rustbot commented Feb 6, 2025

r? @Nadrieril

rustbot has assigned @Nadrieril.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@WaffleLapkin
Copy link
Member Author

@bors rollup

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Feb 6, 2025
@compiler-errors
Copy link
Member

There's at least 4 .map_or(true, that I can find in the compiler codebase. Is there a reason you're just replacing one of them? Could you fix the others?

@WaffleLapkin
Copy link
Member Author

@compiler-errors I've rg "map_or\(true" compilered and all other occurrences are unfixable. 3 of them use Result::map_or (there is no Result::is_err_or) and 1 of them is commented-out code in cranelift backend.

@compiler-errors
Copy link
Member

foiled again by the Option/Result apis differing :clueless:

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 6, 2025

📌 Commit d4914a7 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 Feb 6, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 7, 2025
@matthiaskrgr
Rollup merge of rust-lang#136664 - WaffleLapkin:un-map_or-true, r=com…
9541ce1 
…piler-errors

replace one `.map_or(true, ...)` with `.is_none_or(...)`

Randomly found while going through some of my old branches.
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 7, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2025
@bors
Auto merge of rust-lang#136673 - matthiaskrgr:rollup-re3su3c, r=matth…
81e3b6e 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#134367 (Stabilize `feature(trait_upcasting)`)
 - rust-lang#135354 ([Debuginfo] Add MSVC Synthetic and Summary providers to LLDB)
 - rust-lang#135940 (Update toolstate maintainers)
 - rust-lang#135945 (Remove some unnecessary parens in `assert!` conditions)
 - rust-lang#136577 (Pattern Migration 2024: try to suggest eliding redundant binding modifiers)
 - rust-lang#136598 (Fix suggestion for `dependency_on_unit_never_type_fallback` involving closures + format args expansions)
 - rust-lang#136653 (Remove dead code from rustc_codegen_llvm and the LLVM wrapper)
 - rust-lang#136664 (replace one `.map_or(true, ...)` with `.is_none_or(...)`)

Failed merges:

 - rust-lang#136193 (Implement pattern type ffi checks)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 7, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2025
@bors
Auto merge of rust-lang#136697 - matthiaskrgr:rollup-eww4vl9, r=matth…
a9e7b30 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#134367 (Stabilize `feature(trait_upcasting)`)
 - rust-lang#135940 (Update toolstate maintainers)
 - rust-lang#135945 (Remove some unnecessary parens in `assert!` conditions)
 - rust-lang#136577 (Pattern Migration 2024: try to suggest eliding redundant binding modifiers)
 - rust-lang#136598 (Fix suggestion for `dependency_on_unit_never_type_fallback` involving closures + format args expansions)
 - rust-lang#136653 (Remove dead code from rustc_codegen_llvm and the LLVM wrapper)
 - rust-lang#136664 (replace one `.map_or(true, ...)` with `.is_none_or(...)`)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2025
@rust-timer
Unrolled build for rust-lang#136664
8b05d08 
Rollup merge of rust-lang#136664 - WaffleLapkin:un-map_or-true, r=compiler-errors

replace one `.map_or(true, ...)` with `.is_none_or(...)`

Randomly found while going through some of my old branches.
@bors bors merged commit b4c4913 into rust-lang:master Feb 7, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 7, 2025
@WaffleLapkin WaffleLapkin deleted the un-map_or-true branch February 7, 2025 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Nadrieril Nadrieril

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
5 participants
@WaffleLapkin @rustbot @compiler-errors @bors @Nadrieril