Skip to content

Destabilize fixed-width const defined atomic integers#58616

Merged
bors merged 1 commit intorust-lang:masterfrom
vertexclique:destabilize-fixed-width-atomic-integers
Feb 22, 2019
Merged

Destabilize fixed-width const defined atomic integers#58616
bors merged 1 commit intorust-lang:masterfrom
vertexclique:destabilize-fixed-width-atomic-integers

Conversation

@vertexclique
Copy link
Member

@vertexclique vertexclique commented Feb 21, 2019 •
edited by Centril
Loading

With this PR version 1.34.0 onwards const declarations of atomic integers will be unstable.

@vertexclique
Destabilize fixed-width const defined atomic integers
99d67ca 
* With this PR 1.34.0 onwards const declarations of atomic integers will be
  unstable.
@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 21, 2019

r? @dtolnay

(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 Feb 21, 2019
@Centril
Copy link
Contributor

Centril commented Feb 21, 2019

@bors p=50

dtolnay
dtolnay approved these changes Feb 21, 2019
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thanks, looks good to me. I confirmed that the three existing stable consts as of rustc 1.33.0-beta, ATOMIC_BOOL_INIT, ATOMIC_ISIZE_INIT, ATOMIC_USIZE_INIT continue to be stable (but deprecated) with this PR, while the unstable as of rustc 1.33.0-beta consts are being reverted to unstable.

@dtolnay
Copy link
Member

dtolnay commented Feb 21, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 21, 2019

📌 Commit 99d67ca has been approved by dtolnay

@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 Feb 21, 2019
@bors
Copy link
Collaborator

bors commented Feb 21, 2019

⌛ Testing commit 99d67ca with merge 822c2262217f7f34e049930d557af72fc735d731...

@Centril
Copy link
Contributor

Centril commented Feb 21, 2019

@bors retry

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 21, 2019

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
Cloning into 'rust-lang/rust'...
travis_time:end:06e6e2c6:start=1550782468421553257,finish=1550782474462258704,duration=6040705447
$ cd rust-lang/rust
$ git checkout -qf 822c2262217f7f34e049930d557af72fc735d731
fatal: reference is not a tree: 822c2262217f7f34e049930d557af72fc735d731
The command "git checkout -qf 822c2262217f7f34e049930d557af72fc735d731" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@scottmcm
Copy link
Member

scottmcm commented Feb 21, 2019

Awesome, thanks @vertexclique! Great that this is getting in in time so we don't add debt.

@vertexclique
Copy link
Member Author

vertexclique commented Feb 21, 2019

Aye! Better together folks!

@bors
Copy link
Collaborator

bors commented Feb 21, 2019

⌛ Testing commit 99d67ca with merge 4de13991d613e2cb81717bc66591916c93553622...

@Centril
Copy link
Contributor

Centril commented Feb 21, 2019

@bors retry

@Centril
Copy link
Contributor

Centril commented Feb 22, 2019

@bors treeclosed-

@bors
Copy link
Collaborator

bors commented Feb 22, 2019

⌛ Testing commit 99d67ca with merge d1f8970...

bors added a commit that referenced this pull request Feb 22, 2019
@bors
Auto merge of #58616 - vertexclique:destabilize-fixed-width-atomic-in…
d1f8970 
…tegers, r=dtolnay

Destabilize fixed-width const defined atomic integers

With this PR version 1.34.0 onwards const declarations of atomic integers will be unstable.

* Closes #58089
* Reverts partially: #57425
@bors
Copy link
Collaborator

bors commented Feb 22, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: dtolnay
Pushing d1f8970 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2019
@bors
Copy link
Collaborator

bors commented Feb 22, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: dtolnay
Pushing d1f8970 to master...

@bors bors merged commit 99d67ca into rust-lang:master Feb 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vertexclique @rust-highfive @Centril @dtolnay @bors @scottmcm