Skip to content

Use target instead of machine for mir interpreter integer handling.#108047

Merged
bors merged 1 commit intorust-lang:masterfrom
oli-obk:machine->🞋
Feb 16, 2023

Hidden character warning

The head ref may contain hidden characters: "machine->\ud83d\udf8b"
Merged

Use target instead of machine for mir interpreter integer handling.#108047
bors merged 1 commit intorust-lang:masterfrom
oli-obk:machine->🞋

Conversation

@oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 14, 2023

The naming of machine only makes sense from a mir interpreter internals perspective, but outside users talk about the target platform. As per #108029 (comment)

r? @RalfJung

@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @RalfJung (or someone else) soon.

Please see the contribution instructions for more information.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2023

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

RalfJung
RalfJung reviewed Feb 14, 2023
View reviewed changes
@RalfJung
Copy link
Member

RalfJung commented Feb 14, 2023

So this renames machine_usize → target_usize but leaves other uses of the term "machine" unchanged? LGTM, r=me with CI happy.

@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 14, 2023

leaves other uses of the term "machine" unchanged

yea. I looked at the other uses, like the trait and modules, but it's not really about the target. The Machine trait impls for example are different mir interpreters and, while internally handling target specific things, that's not their purpose. There are no more fn .*machine.* except those that refer to LLVM or GCC specific backend logic.

@RalfJung
Copy link
Member

RalfJung commented Feb 14, 2023

The Machine trait impls

Those are about the "Abstract Machine" and I think the name still makes sense.

@bors
Copy link
Collaborator

bors commented Feb 14, 2023

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

@oli-obk
Use target instead of machine for mir interpreter integer handling.
38b7cdf 
The naming of `machine` only makes sense from a mir interpreter internals perspective, but outside users talk about the `target` platform
@RalfJung
Copy link
Member

RalfJung commented Feb 15, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 15, 2023

📌 Commit 38b7cdf has been approved by RalfJung

It is now in the queue for this repository.

@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 15, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2023
@bors
Auto merge of rust-lang#108096 - matthiaskrgr:rollup-ncexzf6, r=matth…
dc7a676 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#107034 (Migrating rustc_infer to session diagnostics (part 4))
 - rust-lang#107972 (Fix unintentional UB in ui tests)
 - rust-lang#108010 (Make `InferCtxt::can_eq` and `InferCtxt::can_sub` return booleans)
 - rust-lang#108021 (make x look for x.py if shell script does not exist)
 - rust-lang#108047 (Use `target` instead of `machine` for mir interpreter integer handling.)
 - rust-lang#108049 (Don't suggest `#[doc(hidden)]` trait methods with matching return type)
 - rust-lang#108066 (Better names for illegal impl trait positions)
 - rust-lang#108076 (rustdoc: Use more let chain)
 - rust-lang#108088 (clarify correctness of `black_box`)
 - rust-lang#108094 (Demonstrate I/O in File examples)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 31d7e51 into rust-lang:master Feb 16, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 16, 2023
Jarcho pushed a commit to Jarcho/rust that referenced this pull request Feb 26, 2023
@matthiaskrgr
Rollup merge of rust-lang#108047 - oli-obk:machine->🞋, r=RalfJung
dd6534a 
Use `target` instead of `machine` for mir interpreter integer handling.

The naming of `machine` only makes sense from a mir interpreter internals perspective, but outside users talk about the `target` platform. As per rust-lang#108029 (comment)

r? `@RalfJung`
@qinheping qinheping mentioned this pull request Mar 10, 2023
Closed
4 tasks
@tautschnig tautschnig mentioned this pull request Apr 16, 2023
Merged
4 tasks
tautschnig added a commit to tautschnig/kani that referenced this pull request Apr 16, 2023
@tautschnig @qinheping
Upgrade Rust toolchain to nightly-2023-02-17
629340a 
Upstream PRs that require local changes:

- Don't ICE in might_permit_raw_init if reference is polymorphic rust-lang/rust#108012
- Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047
- Optimize mk_region rust-lang/rust#108020

Co-authored-by: Qinheping Hu <qinhh@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees

@RalfJung RalfJung

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.69.0

Development

Successfully merging this pull request may close these issues.

4 participants

@oli-obk @rustbot @RalfJung @bors