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.

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

Add method Result::into_ok #66045

Merged
merged 3 commits into from
Jan 10, 2020
Merged

Add method Result::into_ok #66045

merged 3 commits into from
Jan 10, 2020

Conversation

mzabaluev
Copy link
Contributor

@mzabaluev mzabaluev commented Nov 2, 2019

Implementation of rust-lang/rfcs#2799

Tracking issue #61695

@rust-highfive
Copy link
Collaborator

r? @sfackler

(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 Nov 2, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-11-02T19:55:01.9269595Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-02T19:55:01.9496956Z ##[command]git config gc.auto 0
2019-11-02T19:55:02.9244378Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-02T19:55:02.9251689Z ##[command]git config --get-all http.proxy
2019-11-02T19:55:02.9257650Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66045/merge:refs/remotes/pull/66045/merge
---
2019-11-02T20:01:12.0256749Z Found 0 error codes with no tests
2019-11-02T20:01:12.0257402Z Done!
2019-11-02T20:01:12.0257436Z 
2019-11-02T20:01:12.0257486Z 
2019-11-02T20:01:12.0258285Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-11-02T20:01:12.0258380Z 
2019-11-02T20:01:12.0258419Z 
2019-11-02T20:01:12.0266522Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-11-02T20:01:12.0266604Z Build completed unsuccessfully in 0:01:20
2019-11-02T20:01:12.0266604Z Build completed unsuccessfully in 0:01:20
2019-11-02T20:01:12.0310686Z == clock drift check ==
2019-11-02T20:01:12.0322949Z   local time: Sat Nov  2 20:01:12 UTC 2019
2019-11-02T20:01:12.1036837Z   network time: Sat, 02 Nov 2019 20:01:12 GMT
2019-11-02T20:01:12.1041908Z == end clock drift check ==
2019-11-02T20:01:13.5224593Z 
2019-11-02T20:01:13.5328795Z ##[error]Bash exited with code '1'.
2019-11-02T20:01:13.5355489Z ##[section]Starting: Checkout
2019-11-02T20:01:13.5357419Z ==============================================================================
2019-11-02T20:01:13.5357488Z Task         : Get sources
2019-11-02T20:01:13.5357530Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@mzabaluev mzabaluev changed the title Add Result::unwrap_infallible Add method Result::into_ok Nov 4, 2019
@JohnCSimon
Copy link
Member

Ping from triage:
@sfackler Can you please review this PR?
CC: @mzabaluev

Thanks!

@sfackler sfackler added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Nov 9, 2019
@sfackler
Copy link
Member

sfackler commented Nov 9, 2019

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Nov 9, 2019

Team member @sfackler has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Nov 9, 2019
@JohnCSimon
Copy link
Member

Ping from triage - this PR is still waiting on review:
cc: @Kimundi @KodrAus @SimonSapin @sfackler @mzabaluev
Thanks.

@SimonSapin
Copy link
Contributor

I’ve changed the PR description to not close #61695 since that is to become the tracking issue.

@JohnCSimon
Copy link
Member

Ping from triage - @sfackler this looks like it's still waiting on a merge

@sfackler
Copy link
Member

It is still waiting on one of @Kimundi, @KodrAus, or @withoutboats to complete the FCP process.

@rfcbot
Copy link

rfcbot commented Nov 29, 2019

🔔 This is now entering its final comment period, as per the review above. 🔔

@rfcbot rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Nov 29, 2019
@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Dec 9, 2019
@rfcbot
Copy link

rfcbot commented Dec 9, 2019

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 10, 2019

📌 Commit 6f6848f has been approved by sfackler

@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 Dec 10, 2019
@bors
Copy link
Contributor

bors commented Dec 10, 2019

⌛ Testing commit 6f6848f with merge cf5afc8...

bors added a commit that referenced this pull request Dec 10, 2019
Add method Result::into_ok

Implementation of rust-lang/rfcs#2799

Tracking issue #61695
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-12-10T06:45:51.2672888Z   local time: Tue Dec 10 06:45:51 UTC 2019
2019-12-10T06:45:51.4070172Z   network time: Tue, 10 Dec 2019 06:45:51 GMT
2019-12-10T06:45:51.4073322Z == end clock drift check ==
2019-12-10T06:45:51.8296195Z 
2019-12-10T06:45:51.8376250Z ##[error]Bash exited with code '1'.
2019-12-10T06:45:51.8421090Z ##[section]Starting: Checkout
2019-12-10T06:45:51.8422650Z ==============================================================================
2019-12-10T06:45:51.8422740Z Task         : Get sources
2019-12-10T06:45:51.8422805Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Dec 10, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 10, 2019
@mzabaluev
Copy link
Contributor Author

never_type has been stabilized since this branch was first submitted. I have rebased and removed the feature(never_type) crate attributes from tests.

@KodrAus
Copy link
Contributor

KodrAus commented Dec 11, 2019

@bors retry

@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 Dec 11, 2019
@MikailBag
Copy link
Contributor

MikailBag commented Dec 11, 2019

Probably it is too late for changes, but I think feature should be renamed too (e.g. to result_into_ok).

@bors
Copy link
Contributor

bors commented Dec 21, 2019

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

@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 Dec 21, 2019
@mzabaluev
Copy link
Contributor Author

The rebased branch is mergeable and the code currently compiles. Does anything else need to be done to remove S-waiting-on-author?

@dtolnay
Copy link
Member

dtolnay commented Jan 10, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 10, 2020

📌 Commit 6f0672c 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 10, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 10, 2020
bors added a commit that referenced this pull request Jan 10, 2020
Rollup of 8 pull requests

Successful merges:

 - #66045 (Add method Result::into_ok)
 - #67258 (Introduce `X..`, `..X`, and `..=X` range patterns)
 - #68014 (Unify output of "variant not found" errors)
 - #68019 (Build compiletest with in-tree libtest)
 - #68039 (remove explicit strip-hidden pass from compiler doc generation)
 - #68050 (Canonicalize rustc_error imports)
 - #68059 (Allow specifying LLVM args in target specifications)
 - #68075 (rustbuild: Cleanup book generation)

Failed merges:

 - #68089 (Unstabilize `Vec::remove_item`)

r? @ghost
@bors bors merged commit 6f0672c into rust-lang:master Jan 10, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 25, 2021
Add Result::into_err where the Ok variant is the never type

Equivalent of rust-lang#66045 but for the inverse situation where `T: Into<!>` rather than `E: Into<!>`.

I'm using the same feature gate name. I can't see why one of these methods would be OK to stabilize but not the other.

Tracking issue: rust-lang#61695
@dtolnay dtolnay self-assigned this Mar 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants