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

Rename Result::as_deref_ok to as_deref #67930

Merged
merged 2 commits into from
Jan 11, 2020
Merged

Rename Result::as_deref_ok to as_deref #67930

merged 2 commits into from
Jan 11, 2020

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Jan 6, 2020 •
edited by dtolnay
Loading

Addresses #50264 (comment)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 6, 2020
dtolnay
dtolnay approved these changes Jan 6, 2020
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.

Thanks!

@dtolnay
Copy link
Member

dtolnay commented Jan 6, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 6, 2020

📌 Commit 75ec5ed720a2b87be4478225ffe16cca6355d77d has been approved by dtolnay

@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 Jan 6, 2020
@dtolnay
Copy link
Member

dtolnay commented Jan 6, 2020

@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

@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 Jan 6, 2020
@tesuji
Copy link
Contributor Author

tesuji commented Jan 6, 2020

That's right. I totally forgot about that.

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@tesuji
Copy link
Contributor Author

tesuji commented Jan 6, 2020

The build is green.

@tesuji

This comment has been minimized.

Sign in to view
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 7, 2020
@bors
Copy link
Contributor

bors commented Jan 10, 2020

☔ The latest upstream changes (presumably #68101) made this pull request unmergeable. Please resolve the merge conflicts.

@dtolnay
Copy link
Member

dtolnay commented Jan 11, 2020

LGTM but needs a quick rebase.

@tesuji
Copy link
Contributor Author

tesuji commented Jan 11, 2020

Rebased.

@dtolnay
Copy link
Member

dtolnay commented Jan 11, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2020

📌 Commit c2c2d3b has been approved by dtolnay

@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 Jan 11, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge of rust-lang#67930 - lzutao:result-as_deref, r=dtolnay
82e6a6b 
Rename Result::as_deref_ok to as_deref

Addresses rust-lang#50264 (comment)
r? @dtolnay
@Centril Centril mentioned this pull request Jan 11, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge of rust-lang#67930 - lzutao:result-as_deref, r=dtolnay
1691ee2 
Rename Result::as_deref_ok to as_deref

Addresses rust-lang#50264 (comment)
r? @dtolnay
@Centril Centril mentioned this pull request Jan 11, 2020
Closed
bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of #68124 - Centril:rollup-4h2ybcj, r=Centril
13ad02f 
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
@Centril
Rollup merge of rust-lang#67930 - lzutao:result-as_deref, r=dtolnay
29a1cf2 
Rename Result::as_deref_ok to as_deref

Addresses rust-lang#50264 (comment)
r? @dtolnay
@Centril Centril mentioned this pull request Jan 11, 2020
Merged
bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of #68126 - Centril:rollup-cz5u7xx, r=Centril
bfd0487 
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
@bors bors merged commit c2c2d3b into rust-lang:master Jan 11, 2020
@tesuji tesuji deleted the result-as_deref branch January 11, 2020 16:10
@U007D U007D mentioned this pull request Jun 17, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tesuji @dtolnay @bors @rust-highfive @rustbot