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.

Sign up for GitHub

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

Jump to bottom

Stabilize hint::spin_loop #76097

Merged
merged 1 commit into from
Nov 8, 2020
Merged

Stabilize hint::spin_loop #76097

merged 1 commit into from
Nov 8, 2020

Conversation

pickfire
Copy link
Contributor

Partially fix #55002, deprecate in another release

r? @KodrAus

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2020
@jyn514 jyn514 added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Aug 31, 2020
@jyn514
Copy link
Member

jyn514 commented Aug 31, 2020 

 error: the feature `renamed_spin_loop` has been stable since 1.47.0 and no longer requires an attribute to enable
   --> library/std/src/lib.rs:295:12
    |
295 | #![feature(renamed_spin_loop)]
    |            ^^^^^^^^^^^^^^^^^

Needs cfg_attr(bootstrap, feature(renamed_spin_loop))

@pickfire
Copy link
Contributor Author 

 error: the feature `renamed_spin_loop` has been stable since 1.47.0 and no longer requires an attribute to enable
   --> library/std/src/lib.rs:215:32
    |
215 | #![cfg_attr(bootstrap, feature(renamed_spin_loop))]
    |                                ^^^^^^^^^^^^^^^^^
    |
    = note: `-D stable-features` implied by `-D warnings`

error: aborting due to previous error

error: could not compile `std`.

Is it that it should be #![cfg_attr(not(bootstrap), feature(renamed_spin_loop))]?

KodrAus
KodrAus reviewed Sep 1, 2020
View reviewed changes
Copy link
Contributor

@KodrAus KodrAus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it that it should be #![cfg_attr(not(bootstrap), feature(renamed_spin_loop))]?

I think we can actually just remove the renamed_spin_loop altogether, since that's what we're stabilizing. At least that seems to work for me locally 🙂

library/core/src/hint.rs Outdated Show resolved Hide resolved
@pickfire
Copy link
Contributor Author

pickfire commented Sep 5, 2020

I think we can actually just remove the renamed_spin_loop altogether, since that's what we're stabilizing. At least that seems to work for me locally slightly_smiling_face

Oh, I forgot that we could remove it.

@KodrAus
Copy link
Contributor

KodrAus commented Sep 11, 2020

@bors try

@bors
Copy link
Contributor

bors commented Sep 11, 2020

⌛ Trying commit f7ee5dad97d39755e8549c2eeb9121b0c2101477 with merge e76d95063a57c76c55da09725e42150bdfde978b...

@bors
Copy link
Contributor

bors commented Sep 11, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: e76d95063a57c76c55da09725e42150bdfde978b (e76d95063a57c76c55da09725e42150bdfde978b)

KodrAus
KodrAus reviewed Sep 11, 2020
View reviewed changes
Copy link
Contributor

@KodrAus KodrAus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @pickfire!

I've just left a few little suggestions, but I think this is looking good.

library/core/src/hint.rs Outdated Show resolved Hide resolved
library/core/src/hint.rs Outdated Show resolved Hide resolved
library/core/src/hint.rs Outdated Show resolved Hide resolved
library/core/src/sync/atomic.rs Outdated Show resolved Hide resolved
@jonas-schievink jonas-schievink added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 13, 2020
@KodrAus
Copy link
Contributor

KodrAus commented Sep 22, 2020

@bors try

@bors
Copy link
Contributor

bors commented Sep 22, 2020

⌛ Trying commit 3d6b411233283c879dc1988ab031905c36e35cbb with merge b828e07c76cedb02561ae676718d3109080009c9...

@bors
Copy link
Contributor

bors commented Sep 22, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: b828e07c76cedb02561ae676718d3109080009c9 (b828e07c76cedb02561ae676718d3109080009c9)

@KodrAus
Copy link
Contributor

KodrAus commented Oct 5, 2020

Just circling back around to this now. It looks like we've got a happy build now! @pickfire would you like to update the example? After that I think this will be good to go, but we might want to bump the stabilization to 1.48.0.

@KodrAus
Copy link
Contributor

KodrAus commented Oct 5, 2020

@rustbot modify labels to +S-waiting-on-author, -S-waiting-on-review

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 5, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 5, 2020 •
edited
Loading

I think you mean 1.49 -- 1.48 will be promoted to beta on Tuesday.

@pickfire
Copy link
Contributor Author

pickfire commented Oct 5, 2020 •
edited
Loading

@KodrAus Example is updated. Thanks for the ping.

@pickfire
Copy link
Contributor Author

pickfire commented Oct 5, 2020

@KodrAus Sorry, I accidentally rebased the wrong commit and your commits were gone, I felt lazy to reflog it so I just added the co-authored to the commit message instead.

@jyn514
Copy link
Member

jyn514 commented Nov 6, 2020

@bors r=KodrAus

@jyn514 jyn514 closed this Nov 6, 2020
@bors
Copy link
Contributor

bors commented Nov 6, 2020

📌 Commit e8b5be5 has been approved by KodrAus

@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. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2020
@jyn514 jyn514 reopened this Nov 6, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#76097 - pickfire:stabilize-spin-loop, r=Kod…
8a27822 
…rAus

Stabilize hint::spin_loop

Partially fix rust-lang#55002, deprecate in another release

r? `@KodrAus`
@m-ou-se m-ou-se mentioned this pull request Nov 7, 2020
Closed
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#76097 - pickfire:stabilize-spin-loop, r=Kod…
309522a 
…rAus

Stabilize hint::spin_loop

Partially fix rust-lang#55002, deprecate in another release

r? ``@KodrAus``
@m-ou-se m-ou-se mentioned this pull request Nov 7, 2020
Closed
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#76097 - pickfire:stabilize-spin-loop, r=Kod…
ebe0a23 
…rAus

Stabilize hint::spin_loop

Partially fix rust-lang#55002, deprecate in another release

r? ```@KodrAus```
@m-ou-se m-ou-se mentioned this pull request Nov 7, 2020
Closed
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
@m-ou-se
Rollup merge of rust-lang#76097 - pickfire:stabilize-spin-loop, r=Kod…
c68f3b7 
…rAus

Stabilize hint::spin_loop

Partially fix rust-lang#55002, deprecate in another release

r? ````@KodrAus````
@m-ou-se m-ou-se mentioned this pull request Nov 7, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#76097 - pickfire:stabilize-spin-loop, r=Kod…
548e1b9 
…rAus

Stabilize hint::spin_loop

Partially fix rust-lang#55002, deprecate in another release

r? `````@KodrAus`````
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Nov 8, 2020
Closed
@m-ou-se m-ou-se mentioned this pull request Nov 8, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2020
@bors
Auto merge of rust-lang#78874 - m-ou-se:rollup-3jp1ijj, r=m-ou-se
b1277d0 
Rollup of 19 pull requests

Successful merges:

 - rust-lang#76097 (Stabilize hint::spin_loop)
 - rust-lang#76227 (Stabilize `Poll::is_ready` and `is_pending` as const)
 - rust-lang#78065 (make concurrency helper more pleasant to read)
 - rust-lang#78570 (Remove FIXME comment in print_type_sizes ui test suite)
 - rust-lang#78572 (Use SOCK_CLOEXEC and accept4() on more platforms.)
 - rust-lang#78658 (Add a tool to run `x.py` from any subdirectory)
 - rust-lang#78706 (Fix run-make tests running when LLVM is disabled)
 - rust-lang#78728 (Constantify `UnsafeCell::into_inner` and related)
 - rust-lang#78775 (Bump Rustfmt and RLS)
 - rust-lang#78788 (Correct unsigned equivalent of isize to be usize)
 - rust-lang#78811 (Make some std::io functions `const`)
 - rust-lang#78828 (use single char patterns for split() (clippy::single_char_pattern))
 - rust-lang#78841 (Small cleanup in `TypeFoldable` derive macro)
 - rust-lang#78842 (Honor the rustfmt setting in config.toml)
 - rust-lang#78843 (Less verbose debug logging from inlining integrator)
 - rust-lang#78852 (Convert a bunch of intra-doc links)
 - rust-lang#78860 (rustc_resolve: Use `#![feature(format_args_capture)]`)
 - rust-lang#78861 (typo and formatting)
 - rust-lang#78865 (Don't fire `CONST_ITEM_MUTATION` lint when borrowing a deref)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1f034f7 into rust-lang:master Nov 8, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 8, 2020
@pickfire pickfire deleted the stabilize-spin-loop branch November 8, 2020 17:47
@pickfire pickfire mentioned this pull request Dec 9, 2020
Merged
@camelid camelid mentioned this pull request Jan 3, 2021
Closed
3 tasks
@JEnoch JEnoch mentioned this pull request Nov 25, 2021
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

@KodrAus KodrAus KodrAus left review comments

@m-ou-se m-ou-se m-ou-se left review comments

@nagisa nagisa nagisa left review comments

Assignees

@KodrAus KodrAus

Labels
relnotes Marks issues that should be documented in the release notes of the next release. 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.49.0
Development

Successfully merging this pull request may close these issues.

Tracking issue for hint::spin_loop (renamed sync::atomic::spin_loop_hint)
10 participants
@pickfire @jyn514 @KodrAus @bors @crlf0710 @m-ou-se @nagisa @jonas-schievink @rust-highfive @rustbot