Miscellaneous inlining improvements

[tmiasko]

No description provided.

[rust-highfive]

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

[rust-highfive]

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

[tmiasko]

@bors try @rust-timer queue

[rust-timer]

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

[bors]

⌛ Trying commit 0134410be63be5315de1af7968d74052bf957707 with merge 0af39324cc01dcfdf88025392b55cf411977d739...

[bors]

☀️ Try build successful - checks-actions
Build commit: 0af39324cc01dcfdf88025392b55cf411977d739 (0af39324cc01dcfdf88025392b55cf411977d739)

[rust-timer]

Queued 0af39324cc01dcfdf88025392b55cf411977d739 with parent 7f9ab03, future comparison URL.

[rust-timer]

Finished benchmarking try commit (0af39324cc01dcfdf88025392b55cf411977d739): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

[oli-obk]

Nice!

@bors r+

[bors]

📌 Commit 0134410be63be5315de1af7968d74052bf957707 has been approved by oli-obk

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout i (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self i --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_span/src/def_id.rs
CONFLICT (content): Merge conflict in compiler/rustc_span/src/def_id.rs
Auto-merging compiler/rustc_middle/src/ty/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[tmiasko]

Rebased to resolve conflicts with #85829 which turned CrateNum into an index type.

[oli-obk]

@bors r+

feel free to do r=reviewer yourself for rebases that don't change anything significant

[bors]

📌 Commit c1f6495 has been approved by oli-obk

[bors]

⌛ Testing commit c1f6495 with merge 1e13a9b...

[bors]

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 1e13a9b to master...

[tmiasko]

feel free to do r=reviewer yourself for rebases that don't change anything significant

I don't have r+ rights.