Skip to content

Miri: Renamed "undef" to "uninit" #75226

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Miri: Renamed "undef" to "uninit" #75226

merged 1 commit into from
Aug 11, 2020

Conversation

pnadon
Copy link
Contributor

@pnadon pnadon commented Aug 6, 2020

Renamed remaining references to "undef" to "uninit" when referring to Miri.

Impacted directories are:

  • src/librustc_codegen_llvm/consts.rs
  • src/librustc_middle/mir/interpret/
  • src/librustc_middle/ty/print/pretty.rs
  • src/librustc_mir/
  • src/tools/clippy/clippy_lints/src/consts.rs

Upon building Miri based on the new changes it was verified that no changes needed to be made with the Miri project.

Related issue #71193

@rust-highfive
Copy link
Contributor

r? @eddyb

(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 Aug 6, 2020
@pnadon
Copy link
Contributor Author

pnadon commented Aug 6, 2020

The test initially failed due to formatting on a particular line in src/librustc_mir/util/pretty.rs. I ran the test which failed on my local machine, and it seems to be ok now.

@RalfJung
Copy link
Member

RalfJung commented Aug 6, 2020

r? @RalfJung

@rust-highfive rust-highfive assigned RalfJung and unassigned eddyb Aug 6, 2020
@RalfJung
Copy link
Member

RalfJung commented Aug 6, 2020

(Next time please Cc me in the PR description or put a link to the PR in the issue when there was prior discussion; I almost missed that you created this PR.)

@pnadon
Copy link
Contributor Author

pnadon commented Aug 6, 2020

(Next time please Cc me in the PR description or put a link to the PR in the issue when there was prior discussion; I almost missed that you created this PR.)

Ok sounds good, I was thinking of doing so but did not want to spam you. I will do so next time!

@bors
Copy link
Collaborator

bors commented Aug 7, 2020

☔ The latest upstream changes (presumably #74821) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member

RalfJung commented Aug 8, 2020

Please don't add merge commits to PRs; instead, please rebase on top of current master.

Comment on lines 639 to 640
// An optimization where we can just overwrite an entire range of an entire range of
// initialization bits bits if they are going to be uniformly `1` or `0`.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// An optimization where we can just overwrite an entire range of an entire range of
// initialization bits bits if they are going to be uniformly `1` or `0`.
// An optimization where we can just overwrite an entire range of
// initialization bits if they are going to be uniformly `1` or `0`.

Renamed remaining references to "undef" to "uninit" when referring to Miri.

Impacted directories are:

- src/librustc_codegen_llvm/consts.rs
- src/librustc_middle/mir/interpret/
- src/librustc_middle/ty/print/pretty.rs
- src/librustc_mir/
- src/tools/clippy/clippy_lints/src/consts.rs

Upon building Miri based on the new changes it was verified that no changes needed to be made with the Miri project.

Related issue #71193
@RalfJung
Copy link
Member

@bors r+ rollup
(there's no email notification after a force-push so I did not realize this was ready for review again. feel free to ping me in such cases.)

@bors
Copy link
Collaborator

bors commented Aug 10, 2020

📌 Commit 0c6e8b6 has been approved by RalfJung

@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 Aug 10, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#74744 (Update RELEASES.md for 1.46.0)
 - rust-lang#75085 (Transmute big endian `s6_addr` and `[u16; 8]`)
 - rust-lang#75226 (Miri: Renamed "undef" to "uninit")
 - rust-lang#75333 (polymorphize: constrain unevaluated const handling)
 - rust-lang#75338 (move stack size check to const_eval machine)
 - rust-lang#75347 (Rustdoc: Fix natural ordering to look at all numbers.)
 - rust-lang#75352 (Tweak conditions for E0026 and E0769)
 - rust-lang#75353 (Tiny cleanup, remove unnecessary `unwrap`)
 - rust-lang#75359 (unused_delims: trim expr)
 - rust-lang#75360 (Add sample fix for E0749)

Failed merges:

r? @ghost
@bors bors merged commit c27779f into rust-lang:master Aug 11, 2020
flip1995 pushed a commit to flip1995/rust that referenced this pull request Aug 28, 2020
Miri: Renamed "undef" to "uninit"

Renamed remaining references to "undef" to "uninit" when referring to Miri.

Impacted directories are:

- `src/librustc_codegen_llvm/consts.rs`
- `src/librustc_middle/mir/interpret/`
- `src/librustc_middle/ty/print/pretty.rs`
- `src/librustc_mir/`
- `src/tools/clippy/clippy_lints/src/consts.rs`

Upon building Miri based on the new changes it was verified that no changes needed to be made with the Miri project.

Related issue rust-lang#71193
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
# for free to join this conversation on GitHub. Already have an account? # 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.

6 participants