Skip to content

Fix another manual_unwrap_or deref FP #7235

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
May 18, 2021
Merged

Fix another manual_unwrap_or deref FP #7235

merged 2 commits into from
May 18, 2021

Conversation

camsteffen
Copy link
Contributor

changelog: none (since this just piggybacks on #7233)

Fixes #6960

@rust-highfive
Copy link

r? @phansch

(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 May 17, 2021
@flip1995
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented May 17, 2021

📌 Commit 8356c48 has been approved by flip1995

bors added a commit that referenced this pull request May 17, 2021
@bors
Auto merge of #7235 - camsteffen:manual-unwrap-or-deref, r=flip1995
17442ae 
Fix another manual_unwrap_or deref FP

changelog: none (since this just piggybacks on #7233)

Fixes #6960
@bors
Copy link
Contributor

bors commented May 17, 2021

⌛ Testing commit 8356c48 with merge 17442ae...

@bors
Copy link
Contributor

bors commented May 17, 2021

💔 Test failed - checks-action_test

@flip1995
Copy link
Member

Oh no. Please work, I don't want to deal with this (would be a 2 line fix in the CI script inserting rustup self update, but I don't want such a temporary patch in the workflow ymls if we can avoid it...)

@bors retry

@bors
Copy link
Contributor

bors commented May 17, 2021

⌛ Testing commit 8356c48 with merge d1e3812...

bors added a commit that referenced this pull request May 17, 2021
@bors
Auto merge of #7235 - camsteffen:manual-unwrap-or-deref, r=flip1995
d1e3812 
Fix another manual_unwrap_or deref FP

changelog: none (since this just piggybacks on #7233)

Fixes #6960
@bors
Copy link
Contributor

bors commented May 17, 2021

💔 Test failed - checks-action_test

@phansch
Copy link
Contributor

phansch commented May 18, 2021

@bors retry

@bors
Copy link
Contributor

bors commented May 18, 2021

⌛ Testing commit 8356c48 with merge 9659ff7...

bors added a commit that referenced this pull request May 18, 2021
@bors
Auto merge of #7235 - camsteffen:manual-unwrap-or-deref, r=flip1995
9659ff7 
Fix another manual_unwrap_or deref FP

changelog: none (since this just piggybacks on #7233)

Fixes #6960
@bors
Copy link
Contributor

bors commented May 18, 2021

💔 Test failed - checks-action_test

@flip1995 flip1995 added S-waiting-on-bors Status: The marked PR was approved and is only waiting bors and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels May 18, 2021
@flip1995
Copy link
Member

@bors retry rollup

@flip1995 flip1995 mentioned this pull request May 18, 2021
Merged
bors added a commit that referenced this pull request May 18, 2021
@bors
Auto merge of #7240 - flip1995:rollup-6nwjgyp, r=flip1995
561e943 
Rollup of 3 pull requests

Successful merges:

 - #7235 (Fix another manual_unwrap_or deref FP)
 - #7237 (Add the command to add upstream remote)
 - #7239 (CI: update rustup before installing the toolchain on windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented May 18, 2021

⌛ Testing commit 8356c48 with merge a256c70...

bors added a commit that referenced this pull request May 18, 2021
@bors
Auto merge of #7235 - camsteffen:manual-unwrap-or-deref, r=flip1995
a256c70 
Fix another manual_unwrap_or deref FP

changelog: none (since this just piggybacks on #7233)

Fixes #6960
@flip1995
Copy link
Member

@bors retry (yeet)

bors added a commit that referenced this pull request May 18, 2021
@bors
Auto merge of #7240 - flip1995:rollup-6nwjgyp, r=flip1995
213b8d9 
Rollup of 3 pull requests

Successful merges:

 - #7235 (Fix another manual_unwrap_or deref FP)
 - #7237 (Add the command to add upstream remote)
 - #7239 (CI: update rustup before installing the toolchain on windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup

changelog: rollup
@bors bors merged commit 99fb776 into rust-lang:master May 18, 2021
@bors
Copy link
Contributor

bors commented May 18, 2021

⌛ Testing commit 8356c48 with merge 213b8d9...

@camsteffen camsteffen deleted the manual-unwrap-or-deref branch July 8, 2021 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@phansch phansch

Labels
S-waiting-on-bors Status: The marked PR was approved and is only waiting bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FP: manual_unwrap_or help code is not correct
5 participants
@camsteffen @rust-highfive @flip1995 @bors @phansch