Skip to content

Stabilize hint::spin_loop - #76097

Merged
bors merged 1 commit into
rust-lang:masterfrom
pickfire:stabilize-spin-loop
Nov 8, 2020
Merged

Stabilize hint::spin_loop#76097
bors merged 1 commit into
rust-lang:masterfrom
pickfire:stabilize-spin-loop

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Partially fix#55002, deprecate in another release

r? @KodrAus

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2020
Comment threadlibrary/core/src/sync/atomic.rs Outdated
@jyn514jyn514 added the T-libs-api [DEPRECATED; DO NOT USE] label Aug 31, 2020
@jyn514

Copy link
Copy Markdown
Member
 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
Copy Markdown
ContributorAuthor
 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))]?

@KodrAusKodrAus left a comment

Copy link
Copy Markdown
Contributor

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 🙂

Comment threadlibrary/core/src/hint.rs Outdated
@pickfire

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
Contributor

@bors try

@bors

bors commented Sep 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit f7ee5dad97d39755e8549c2eeb9121b0c2101477 with merge e76d95063a57c76c55da09725e42150bdfde978b...

@bors

bors commented Sep 11, 2020

Copy link
Copy Markdown
Collaborator

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

@KodrAusKodrAus left a comment

Copy link
Copy Markdown
Contributor

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.

Comment threadlibrary/core/src/hint.rs Outdated
Comment threadlibrary/core/src/hint.rs Outdated
Comment threadlibrary/core/src/hint.rs Outdated
Comment threadlibrary/core/src/sync/atomic.rs Outdated
@jonas-schievinkjonas-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
Copy Markdown
Contributor

@bors try

@bors

bors commented Sep 22, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 3d6b411233283c879dc1988ab031905c36e35cbb with merge b828e07c76cedb02561ae676718d3109080009c9...

@bors

bors commented Sep 22, 2020

Copy link
Copy Markdown
Collaborator

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

@KodrAus

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

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

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

jyn514 commented Oct 5, 2020

Copy link
Copy Markdown
Member

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

@pickfire

pickfire commented Oct 5, 2020

Copy link
Copy Markdown
ContributorAuthor

@KodrAus Example is updated. Thanks for the ping.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@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
Copy Markdown
Member

@bors r=KodrAus

@jyn514jyn514 closed this Nov 6, 2020
@bors

bors commented Nov 6, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit e8b5be5 has been approved by KodrAus

@borsbors 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
@jyn514jyn514 reopened this Nov 6, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
…rAus
Stabilize hint::spin_loop
Partially fixrust-lang#55002, deprecate in another release
r? `@KodrAus`
@m-ou-sem-ou-se mentioned this pull request Nov 7, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
…rAus
Stabilize hint::spin_loop
Partially fixrust-lang#55002, deprecate in another release
r? ``@KodrAus``
@m-ou-sem-ou-se mentioned this pull request Nov 7, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
…rAus
Stabilize hint::spin_loop
Partially fixrust-lang#55002, deprecate in another release
r? ```@KodrAus```
@m-ou-sem-ou-se mentioned this pull request Nov 7, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 7, 2020
…rAus
Stabilize hint::spin_loop
Partially fixrust-lang#55002, deprecate in another release
r? ````@KodrAus````
@m-ou-sem-ou-se mentioned this pull request Nov 7, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 8, 2020
…rAus
Stabilize hint::spin_loop
Partially fixrust-lang#55002, deprecate in another release
r? `````@KodrAus`````
@m-ou-sem-ou-se mentioned this pull request Nov 8, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2020
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:masterNov 8, 2020
@rustbotrustbot added this to the 1.49.0 milestone Nov 8, 2020
@pickfire
pickfire deleted the stabilize-spin-loop branch November 8, 2020 17:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotesMarks issues that should be documented in the release notes of the next release.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

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