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

Stabilize const-calling existing const-fns in std #46287

Merged
merged 1 commit into from
Nov 29, 2017

Conversation

SimonSapin
Copy link
Contributor

Fixes #46038

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @BurntSushi (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2017
@aturon
Copy link
Member

aturon commented Nov 28, 2017

@bors: r+

Thanks for pushing this through, @SimonSapin

@bors
Copy link
Contributor

bors commented Nov 28, 2017

📌 Commit 6c5f53e has been approved by aturon

@bors
Copy link
Contributor

bors commented Nov 29, 2017

⌛ Testing commit 6c5f53e with merge dbc8d4b392fed320ba4455b2184ee42c9d9f2044...

@bors
Copy link
Contributor

bors commented Nov 29, 2017

💔 Test failed - status-travis

@scottmcm
Copy link
Member

[00:12:31] In file included from /Users/travis/build/rust-lang/rust/src/llvm/lib/Support/ThreadPool.cpp:14:
[00:12:31] In file included from /Users/travis/build/rust-lang/rust/src/llvm/include/llvm/Support/ThreadPool.h:30:
[00:12:31] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/future:1447:23: error: 'future_error' is unavailable: introduced in macOS 10.8
[00:12:31]                       future_error(make_error_code(future_errc::broken_promise))
[00:12:31]                       ^
[00:12:31] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/future:502:63: note: 'future_error' has been explicitly marked unavailable here
[00:12:31] class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_FUTURE_ERROR future_error
[00:12:31]                                                               ^
[00:12:31] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/future:1621:23: error: 'future_error' is unavailable: introduced in macOS 10.8
[00:12:31]                       future_error(make_error_code(future_errc::broken_promise))
[00:12:31]                       ^
[00:12:31] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/future:502:63: note: 'future_error' has been explicitly marked unavailable here
[00:12:31] class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_FUTURE_ERROR future_error
[00:12:31]                                                               ^
[00:12:31] 2 errors generated.
[00:12:31] make[3]: *** [lib/Support/CMakeFiles/LLVMSupport.dir/ThreadPool.cpp.o] Error 1
[00:12:31] make[2]: *** [lib/Support/CMakeFiles/LLVMSupport.dir/all] Error 2

Same error as #46290 (comment)

@kennytm
Copy link
Member

kennytm commented Nov 29, 2017

@bors retry — travis-ci/travis-ci#8821

kennytm added a commit to kennytm/rust that referenced this pull request Nov 29, 2017
Stabilize const-calling existing const-fns in std

Fixes rust-lang#46038
@kennytm kennytm 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 Nov 29, 2017
bors added a commit that referenced this pull request Nov 29, 2017
Rollup of 10 pull requests

- Successful merges: #45969, #46077, #46219, #46287, #46293, #46322, #46323, #46330, #46354, #46356
- Failed merges:
@bors bors merged commit 6c5f53e into rust-lang:master Nov 29, 2017
@SimonSapin SimonSapin deleted the stable-constness branch December 23, 2017 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants