Add method Result::into_ok #66045

mzabaluev · 2019-11-02T18:21:41Z

Tracking issue #61695

rust-highfive · 2019-11-02T18:21:52Z

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2019-11-02T20:12:41Z

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)

JohnCSimon · 2019-11-09T07:56:00Z

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

Thanks!

sfackler · 2019-11-09T16:38:19Z

@rfcbot fcp merge

rfcbot · 2019-11-09T16:38:20Z

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.

JohnCSimon · 2019-11-16T22:38:52Z

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

SimonSapin · 2019-11-17T06:55:50Z

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

JohnCSimon · 2019-11-24T02:30:09Z

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

sfackler · 2019-11-28T03:12:36Z

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

rfcbot · 2019-11-29T03:48:26Z

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

rfcbot · 2019-12-09T03:48:51Z

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 · 2019-12-10T00:58:26Z

@bors r+

bors · 2019-12-10T00:58:27Z

📌 Commit 6f6848f has been approved by sfackler

bors · 2019-12-10T05:42:41Z

⌛ Testing commit 6f6848f with merge cf5afc8...

Add method Result::into_ok Implementation of rust-lang/rfcs#2799 Tracking issue #61695

rust-highfive · 2019-12-10T06:47:11Z

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 · 2019-12-10T06:47:18Z

💔 Test failed - checks-azure

mzabaluev · 2019-12-11T07:10:10Z

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 · 2019-12-11T07:26:26Z

@bors retry

MikailBag · 2019-12-11T19:19:17Z

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

bors · 2019-12-21T17:36:36Z

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

Implementation of rust-lang/rfcs#2799

mzabaluev · 2020-01-03T02:09:21Z

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

dtolnay · 2020-01-10T08:10:10Z

@bors r+

bors · 2020-01-10T08:10:12Z

📌 Commit 6f0672c has been approved by dtolnay

Add method Result::into_ok Implementation of rust-lang/rfcs#2799 Tracking issue rust-lang#61695

@ghost

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

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

rust-highfive assigned sfackler Nov 2, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 2, 2019

mzabaluev changed the title ~~Add Result::unwrap_infallible~~ Add method Result::into_ok Nov 4, 2019

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

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

mzabaluev mentioned this pull request Nov 28, 2019

Fix nightly for introduction of built-in never type input-output-hk/jormungandr#1228

Merged

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 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

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 added a commit that referenced this pull request Dec 10, 2019

Auto merge of #66045 - mzabaluev:unwrap-infallible, r=sfackler

cf5afc8

Add method Result::into_ok Implementation of rust-lang/rfcs#2799 Tracking issue #61695

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 force-pushed the unwrap-infallible branch from 6f6848f to b5e7204 Compare December 10, 2019 23:34

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

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 added 3 commits December 22, 2019 08:05

Add Result::unwrap_infallible

a20013b

Implementation of rust-lang/rfcs#2799

libcore: test Result::unwrap_infallible

9a99a21

Rename Result::unwrap_infallible to into_ok

6f0672c

mzabaluev force-pushed the unwrap-infallible branch from b5e7204 to 6f0672c Compare December 22, 2019 06:35

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

Rollup merge of rust-lang#66045 - mzabaluev:unwrap-infallible, r=dtolnay

2dbcf08

Add method Result::into_ok Implementation of rust-lang/rfcs#2799 Tracking issue rust-lang#61695

JohnTitor mentioned this pull request Jan 10, 2020

Rollup of 8 pull requests #68101

Merged

bors merged commit 6f0672c into rust-lang:master Jan 10, 2020

faern mentioned this pull request Mar 23, 2021

Add Result::into_err where the Ok variant is the never type #83421

Merged

dtolnay self-assigned this Mar 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add method Result::into_ok #66045

Add method Result::into_ok #66045

mzabaluev commented Nov 2, 2019 •

edited by SimonSapin

Loading

rust-highfive commented Nov 2, 2019

rust-highfive commented Nov 2, 2019

JohnCSimon commented Nov 9, 2019

sfackler commented Nov 9, 2019

rfcbot commented Nov 9, 2019 •

edited by KodrAus

Loading

JohnCSimon commented Nov 16, 2019

SimonSapin commented Nov 17, 2019

JohnCSimon commented Nov 24, 2019

sfackler commented Nov 28, 2019

rfcbot commented Nov 29, 2019

rfcbot commented Dec 9, 2019

sfackler commented Dec 10, 2019

bors commented Dec 10, 2019

bors commented Dec 10, 2019

rust-highfive commented Dec 10, 2019

bors commented Dec 10, 2019

mzabaluev commented Dec 11, 2019

KodrAus commented Dec 11, 2019

MikailBag commented Dec 11, 2019 •

edited

Loading

bors commented Dec 21, 2019

mzabaluev commented Jan 3, 2020

dtolnay commented Jan 10, 2020

bors commented Jan 10, 2020

Add method Result::into_ok #66045

Add method Result::into_ok #66045

Conversation

mzabaluev commented Nov 2, 2019 • edited by SimonSapin Loading

rust-highfive commented Nov 2, 2019

rust-highfive commented Nov 2, 2019

JohnCSimon commented Nov 9, 2019

sfackler commented Nov 9, 2019

rfcbot commented Nov 9, 2019 • edited by KodrAus Loading

JohnCSimon commented Nov 16, 2019

SimonSapin commented Nov 17, 2019

JohnCSimon commented Nov 24, 2019

sfackler commented Nov 28, 2019

rfcbot commented Nov 29, 2019

rfcbot commented Dec 9, 2019

sfackler commented Dec 10, 2019

bors commented Dec 10, 2019

bors commented Dec 10, 2019

rust-highfive commented Dec 10, 2019

bors commented Dec 10, 2019

mzabaluev commented Dec 11, 2019

KodrAus commented Dec 11, 2019

MikailBag commented Dec 11, 2019 • edited Loading

bors commented Dec 21, 2019

mzabaluev commented Jan 3, 2020

dtolnay commented Jan 10, 2020

bors commented Jan 10, 2020

mzabaluev commented Nov 2, 2019 •

edited by SimonSapin

Loading

rfcbot commented Nov 9, 2019 •

edited by KodrAus

Loading

MikailBag commented Dec 11, 2019 •

edited

Loading