Rename Result::as_deref_ok to as_deref#67930
Merged
bors merged 2 commits intorust-lang:masterfrom Jan 11, 2020
Merged
Conversation
Member
|
@bors r+ |
Collaborator
|
📌 Commit 75ec5ed720a2b87be4478225ffe16cca6355d77d has been approved by |
Member
|
@bors r- I think there are a bunch of tests that need to change. https://github.com/rust-lang/rust/search?q=as_deref_mut_ok&unscoped_q=as_deref_mut_ok |
Contributor
Author
|
That's right. I totally forgot about that. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
ad678c9 to
55888c6
Compare
Contributor
Author
|
The build is green. |
55888c6 to
de8c74c
Compare
This comment has been minimized.
This comment has been minimized.
Collaborator
|
☔ The latest upstream changes (presumably #68101) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
LGTM but needs a quick rebase. |
de8c74c to
c2c2d3b
Compare
Contributor
Author
|
Rebased. |
Member
|
@bors r+ |
Collaborator
|
📌 Commit c2c2d3b has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
Rename Result::as_deref_ok to as_deref Addresses rust-lang#50264 (comment) r? @dtolnay
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
Rename Result::as_deref_ok to as_deref Addresses rust-lang#50264 (comment) r? @dtolnay
bors
added a commit
that referenced
this pull request
Jan 11, 2020
Rollup of 9 pull requests Successful merges: - #67000 (Promote references to constants instead of statics) - #67756 (Collector tweaks) - #67889 (Compile some CGUs in parallel at the start of codegen) - #67930 (Rename Result::as_deref_ok to as_deref) - #68018 (feature_gate: Remove `GateStrength`) - #68070 (clean up E0185 explanation) - #68072 (Fix ICE #68058) - #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.) - #68120 (Ban `...X` pats, harden tests, and improve diagnostics) Failed merges: r? @ghost
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
Rename Result::as_deref_ok to as_deref Addresses rust-lang#50264 (comment) r? @dtolnay
bors
added a commit
that referenced
this pull request
Jan 11, 2020
Rollup of 8 pull requests Successful merges: - #67756 (Collector tweaks) - #67889 (Compile some CGUs in parallel at the start of codegen) - #67930 (Rename Result::as_deref_ok to as_deref) - #68018 (feature_gate: Remove `GateStrength`) - #68070 (clean up E0185 explanation) - #68072 (Fix ICE #68058) - #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.) - #68120 (Ban `...X` pats, harden tests, and improve diagnostics) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses #50264 (comment)