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

rename LocalState::Uninitialized to Unallocated #95196

Merged
merged 1 commit into from
Mar 22, 2022
Merged

rename LocalState::Uninitialized to Unallocated #95196

merged 1 commit into from
Mar 22, 2022

Conversation

RalfJung
Copy link
Member

This is to avoid confusion with Uninit as in ScalarMaybeUninit, which is very different.

r? @oli-obk

@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 22, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung RalfJung force-pushed the unalloc-not-uninit branch from 69c4256 to b92a605 Compare March 22, 2022 02:48
@oli-obk
Copy link
Contributor

oli-obk commented Mar 22, 2022

Yea, this makes it less confusing

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 22, 2022

📌 Commit b92a605 has been approved by oli-obk

@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 Mar 22, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 22, 2022
@Dylan-DPC
Rollup merge of rust-lang#95196 - RalfJung:unalloc-not-uninit, r=oli-obk
59fe1aa 
rename LocalState::Uninitialized to Unallocated

This is to avoid confusion with `Uninit` as in `ScalarMaybeUninit`, which is very different.

r? `@oli-obk`
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 22, 2022
Closed
@bors
Copy link
Contributor

bors commented Mar 22, 2022

⌛ Testing commit b92a605 with merge 2c7fcd2eeed4d7263e7bc63f961df5cafae0561c...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
 1 file changed, 1 insertion(+)
fatal: Cannot prompt because user interactivity has been disabled.
remote: Internal Server Error
To https://github.com/rust-lang-nursery/rust-toolstate
 ! [remote rejected] master -> master (Internal Server Error)
error: failed to push some refs to 'https://github.com/rust-lang-nursery/rust-toolstate'
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at a613de8 (linux CI update)
[master 285c100] (windows CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
remote: Internal Server Error
To https://github.com/rust-lang-nursery/rust-toolstate
 ! [remote rejected] master -> master (Internal Server Error)
error: failed to push some refs to 'https://github.com/rust-lang-nursery/rust-toolstate'
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at a613de8 (linux CI update)
[master 904a3d0] (windows CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
remote: Internal Server Error
To https://github.com/rust-lang-nursery/rust-toolstate
 ! [remote rejected] master -> master (Internal Server Error)
error: failed to push some refs to 'https://github.com/rust-lang-nursery/rust-toolstate'
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at a613de8 (linux CI update)
[master 8636a97] (windows CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
remote: Internal Server Error
To https://github.com/rust-lang-nursery/rust-toolstate
 ! [remote rejected] master -> master (Internal Server Error)
error: failed to push some refs to 'https://github.com/rust-lang-nursery/rust-toolstate'
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at a613de8 (linux CI update)
[master 4753999] (windows CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
remote: Internal Server Error
To https://github.com/rust-lang-nursery/rust-toolstate
 ! [remote rejected] master -> master (Internal Server Error)
error: failed to push some refs to 'https://github.com/rust-lang-nursery/rust-toolstate'
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at a613de8 (linux CI update)
HEAD is now at a613de8 (linux CI update)
thread 'main' panicked at 'Failed to update toolstate repository with new data', src\bootstrap\toolstate.rs:438:9
Build completed unsuccessfully in 0:00:47

@RalfJung
Copy link
Member Author

@bors retry "remote: Internal Server Error"

@Dylan-DPC Dylan-DPC mentioned this pull request Mar 22, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2022
@bors
Auto merge of rust-lang#95215 - Dylan-DPC:rollup-l9f9t7l, r=Dylan-DPC
5f37001 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#95188 ([`macro-metavar-expr`] Fix generated tokens hygiene)
 - rust-lang#95196 (rename LocalState::Uninitialized to Unallocated)
 - rust-lang#95197 (Suggest constraining param for unary ops when missing trait impl)
 - rust-lang#95200 (Cancel a not emitted error after parsing const generic args)
 - rust-lang#95207 (update Termination trait docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0e59ad4 into rust-lang:master Mar 22, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 22, 2022
@RalfJung RalfJung deleted the unalloc-not-uninit branch March 22, 2022 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.
6 participants
@RalfJung @rust-highfive @rust-log-analyzer @oli-obk @bors @rustbot