Skip to content

Constify ?-operator for Result and Option#86853

Merged
bors merged 10 commits intorust-lang:masterfrom
usbalbin:const_try
Sep 30, 2021
Merged

Constify ?-operator for Result and Option#86853
bors merged 10 commits intorust-lang:masterfrom
usbalbin:const_try

Conversation

@usbalbin
Copy link
Contributor

@usbalbin usbalbin commented Jul 3, 2021 •
edited
Loading

Try to make ?-operator usable in const fn with Result and Option, see #74935 . Note that the try-operator itself was constified in #87237.

TODO

@rust-highfive
Copy link
Contributor

rust-highfive commented Jul 3, 2021

r? @m-ou-se

(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 Jul 3, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jonas-schievink jonas-schievink added the F-const_trait_impl `#![feature(const_trait_impl)]` label Jul 3, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
usbalbin
usbalbin commented Jul 4, 2021
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@usbalbin usbalbin changed the title [experiment] Constify try-operator Constify try-operator Jul 8, 2021
@usbalbin usbalbin mentioned this pull request Jul 29, 2021
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Jul 30, 2021

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@usbalbin usbalbin changed the title Constify try-operator Constify ?-operator for Result and Option Aug 2, 2021
@usbalbin usbalbin force-pushed the const_try branch 2 times, most recently from b7f572b to 5f3c830 Compare August 2, 2021 13:23
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fee1-dead
Copy link
Member

fee1-dead commented Aug 2, 2021 

  = note: conflicting implementation in crate `core`:
          - impl<T, U> Into<U> for T
            where const U: From<T>;

That might be a bug that I need to fix...

@fee1-dead fee1-dead mentioned this pull request Aug 3, 2021
Merged
@bors
Copy link
Collaborator

bors commented Aug 5, 2021

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@usbalbin usbalbin marked this pull request as ready for review September 15, 2021 16:47
@usbalbin
Copy link
Contributor Author

usbalbin commented Sep 28, 2021

Is there anything more you want me to change :)

@oli-obk
Copy link
Contributor

oli-obk commented Sep 28, 2021

Nope, just got lost in my notifications. Thanks for the reminder.

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 28, 2021

📌 Commit 29029c0 has been approved by oli-obk

@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 Sep 28, 2021
@bors
Copy link
Collaborator

bors commented Sep 29, 2021

⌛ Testing commit 29029c0 with merge adb022cf36d99ca01304fbe55c13a88086af5278...

@bors
Copy link
Collaborator

bors commented Sep 29, 2021

💔 Test failed - checks-actions

@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 Sep 29, 2021
@ehuss
Copy link
Contributor

ehuss commented Sep 29, 2021

@bors retry
Issue with Windows LLDB

@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 Sep 29, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Sep 30, 2021

⌛ Testing commit 29029c0 with merge c6007fd...

@bors
Copy link
Collaborator

bors commented Sep 30, 2021

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing c6007fd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2021
@bors bors merged commit c6007fd into rust-lang:master Sep 30, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 30, 2021
@rust-timer
Copy link
Collaborator

rust-timer commented Sep 30, 2021

Finished benchmarking commit (c6007fd): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@ehuss ehuss mentioned this pull request Oct 1, 2021
Closed
eddyb added a commit to eddyb/rust that referenced this pull request Oct 1, 2021
@eddyb
Revert "Auto merge of rust-lang#86853 - usbalbin:const_try, r=oli-obk"
5345239 
This reverts commit c6007fd, reversing
changes made to 69c1c6a.
usbalbin added a commit to usbalbin/rust that referenced this pull request Oct 1, 2021
@usbalbin
Revert "Auto merge of rust-lang#86853 - usbalbin:const_try, r=oli-obk"
81bb5a5 
This reverts commit c6007fd, reversing
changes made to 69c1c6a.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2021
@bors
Auto merge of rust-lang#89450 - usbalbin:const_try_revert, r=oli-obk
a8387ae 
Revert rust-lang#86853

Should fix issue found in rust-lang#89432
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

@fee1-dead fee1-dead fee1-dead left review comments

Assignees

@m-ou-se m-ou-se

Labels

F-const_trait_impl `#![feature(const_trait_impl)]` merged-by-bors This PR was explicitly merged by bors. 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

Milestone

1.57.0

Development

Successfully merging this pull request may close these issues.