Constify ?-operator for Result and Option #86853

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Merged

bors merged 10 commits into rust-lang:master from usbalbin:const_try

Sep 30, 2021

Contributor

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

Add tests for const T -> T conversions
cleanup commits
Remove #![allow(incomplete_features)]
[?] Await decision in constified implementations of Default #86808 - I'm not sure
Await support for parsing ~const in bootstrapping compiler
Tracking issue(s)? - Tracking Issue for const_convert #88674

rust-highfive assigned m-ou-se

Contributor

rust-highfive commented Jul 3, 2021

(rust-highfive has picked a reviewer for you, use r? to override)

rust-highfive added the S-waiting-on-review label

This comment has been minimized.

# to view

jonas-schievink added the F-const_trait_impl label

This comment has been minimized.

# to view

This comment has been minimized.

# to view

usbalbin commented

View reviewed changes

library/core/src/result.rs Show resolved Hide resolved

This comment has been minimized.

# to view

usbalbin changed the title ~~[experiment] Constify try-operator~~ Constify try-operator

usbalbin mentioned this pull request

Add feature gates for for and ? in consts #87237

Merged

usbalbin force-pushed the const_try branch from 533b6cb to 9072fd2 Compare

July 30, 2021 12:16

This comment has been minimized.

# to view

Collaborator

bors commented Jul 30, 2021

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

usbalbin force-pushed the const_try branch from 9072fd2 to 695bac2 Compare

July 30, 2021 15:12

This comment has been minimized.

# to view

usbalbin force-pushed the const_try branch from 695bac2 to 2790f1e Compare

August 1, 2021 21:56

This comment has been minimized.

# to view

This comment has been minimized.

# to view

This comment has been minimized.

# to view

usbalbin changed the title ~~Constify try-operator~~ Constify ?-operator for Result and Option

usbalbin force-pushed the const_try branch 2 times, most recently from b7f572b to 5f3c830 Compare

August 2, 2021 13:23

This comment has been minimized.

# to view

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 mentioned this pull request

constified implementations of Default #86808

Merged

Collaborator

bors commented Aug 5, 2021

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

usbalbin force-pushed the const_try branch from 5f3c830 to 13d2953 Compare

August 5, 2021 21:02

This comment has been minimized.

# to view

usbalbin force-pushed the const_try branch from 13d2953 to 817990e Compare

August 5, 2021 21:29


          Add tracking issue

ff1ecc0

usbalbin force-pushed the const_try branch from 8dfbc79 to ff1ecc0 Compare

September 15, 2021 14:58

This comment has been minimized.

# to view


          Fix formatting

29029c0

usbalbin marked this pull request as ready for review

September 15, 2021 16:47

Contributor Author

usbalbin commented Sep 28, 2021

Is there anything more you want me to change :)

Contributor

oli-obk commented Sep 28, 2021

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

Collaborator

bors commented Sep 28, 2021

📌 Commit 29029c0 has been approved by oli-obk

bors added S-waiting-on-bors and removed S-waiting-on-review labels

Collaborator

bors commented Sep 29, 2021

⌛ Testing commit 29029c0 with merge adb022cf36d99ca01304fbe55c13a88086af5278...

Collaborator

bors commented Sep 29, 2021

💔 Test failed - checks-actions

bors added S-waiting-on-review and removed S-waiting-on-bors labels

Contributor

ehuss commented Sep 29, 2021

@bors retry
Issue with Windows LLDB

bors added S-waiting-on-bors and removed S-waiting-on-review labels

This comment has been minimized.

# to view

Collaborator

bors commented Sep 30, 2021

⌛ Testing commit 29029c0 with merge c6007fd...

Collaborator

bors commented Sep 30, 2021

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

bors added the merged-by-bors label

bors merged commit c6007fd into rust-lang:master

rustbot added this to the 1.57.0 milestone

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 mentioned this pull request

nightly-2021-10-01: the trait From<&str> is not implemented for std::string::String #89432

Closed

eddyb added a commit to eddyb/rust that referenced this pull request


          Revert "Auto merge of rust-lang#86853 - usbalbin:const_try, r=oli-obk"

This reverts commit c6007fd, reversing
changes made to 69c1c6a.

usbalbin added a commit to usbalbin/rust that referenced this pull request


          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


          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

# for free to join this conversation on GitHub. Already have an account? # to comment

Labels

F-const_trait_impl merged-by-bors S-waiting-on-bors T-libs-api