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

Rollup of 7 pull requests #118122

Closed
wants to merge 21 commits into from
Closed

Rollup of 7 pull requests #118122

wants to merge 21 commits into from

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ouz-a and others added 21 commits November 18, 2023 11:09
@ouz-a
Add VarDebugInfo to Stable MIR
c703af3
@ouz-a
de-structure variable and add stables
965f46b
@saethlin
Expand Miri's BorTag GC to a Provenance GC
0d0a417
@saethlin
tag-gc -> provenance-gc
0ec82fa
@nnethercote
Reduce exposure of some items.
e2664eb
@nnethercote
Inline and remove record_layout_for_printing.
a3bd5a0 
It has a single call site.
@nnethercote
Alphabetize features.
9e6ee72
@calebzulawski
Remove i686-apple-darwin cross-testing
6b4465d
@saethlin
Test that the GC consults the extra_fn_ptr map
b991658
@psumbera
Remove now deprecated target x86_64-sun-solaris.
fecd3e6
@saethlin
Test with -Zmiri-provenance-gc=1 on Linux
9ada654
@psumbera
Remove now unnecessary x86_64_sun_solaris.rs.
8a77060
@rustbot
Update books
3c999d8
@spastorino
Fix occurrences of old fn names in comment and tracing
8cf94c9
@compiler-errors
Rollup merge of rust-lang#117972 - ouz-a:stable_debuginfo, r=celinval
f1c72cc 
Add VarDebugInfo to Stable MIR

Previously we omitted `VarDebugInfo` because we didn't have `Projection` now that rust-lang#117517 is merged it's possible to add `VarDebugInfo` information in `Body`. This PR adds stable version of the `VarDebugInfo` to `Body`

r? `@celinval`
@compiler-errors
Rollup merge of rust-lang#118029 - saethlin:allocid-gc, r=RalfJung
4427629 
Expand Miri's BorTag GC to a Provenance GC

As suggested in rust-lang/miri#3080 (comment)

We previously solved memory growth issues associated with the Stacked Borrows and Tree Borrows runtimes with a GC. But of course we also have state accumulation associated with whole allocations elsewhere in the interpreter, and this PR starts tackling those.

To do this, we expand the visitor for the GC so that it can visit a BorTag or an AllocId. Instead of collecting all live AllocIds into a single HashSet, we just collect from the Machine itself then go through an accessor `InterpCx::is_alloc_live` which checks a number of allocation data structures in the core interpreter. This avoids the overhead of all the inserts that collecting their keys would require.

r? `@RalfJung`
@compiler-errors
Rollup merge of rust-lang#118081 - nnethercote:rustc_ty_utils, r=comp…
3b12a59 
…iler-errors

`rustc_ty_utils` cleanups

Minor improvements I found while looking at this code.

r? `@lcnr`
@compiler-errors
Rollup merge of rust-lang#118083 - calebzulawski:remove-i686-apple-da…
390743c 
…rwin, r=albertlarsan68

Remove i686-apple-darwin cross-testing

The Xcode SDK no longer ships with 32-bit Intel (i686-apple-darwin) support as of [Xcode 14](https://developer.apple.com/news/upcoming-requirements/?id=06062022a) (related, rust-lang#112753).  On an up-to-date Intel Mac, `x.py test --bless` fails.

r? `@rust-lang/bootstrap`
@compiler-errors
Rollup merge of rust-lang#118091 - psumbera:solaris-target, r=compile…
369779c 
…r-errors

Remove now deprecated target x86_64-sun-solaris.
@compiler-errors
Rollup merge of rust-lang#118097 - rustbot:docs-update, r=ehuss
026adc2 
Update books

## rust-lang/book

2 commits in 5b6c1ceaa62ecbd6caef08df39b33b3938e99deb..71352deb20727b4dda9ebfe8182709d5bf17dfea
2023-11-09 14:49:45 UTC to 2023-11-09 14:49:16 UTC

- Fixed 'Devtools' link (rust-lang/book#3770)
- Fix mdBook links (rust-lang/book#3769)

## rust-lang/rust-by-example

7 commits in 311b84962016b28c75525c86e7b3f49fd9101a39..a6581246f96837113968c02187db24f742af3908
2023-11-18 21:45:20 UTC to 2023-11-07 22:32:53 UTC

- rename `y` to `_y` to get the correct compile error (rust-lang/rust-by-example#1769)
- fix test name in cargo/test.md (rust-lang/rust-by-example#1768)
- Various minor edits for typo fixes, formatting fixes, and clarifications (rust-lang/rust-by-example#1765)
- Update closures.md to correct a typo (rust-lang/rust-by-example#1763)
- Link to the Bulgarian translation (rust-lang/rust-by-example#1764)
- Fix asm example explanation for `inlateout` usage (22.1 Inline Assembly) (rust-lang/rust-by-example#1766)
- Update index.md: Added descriptions for the 'leftover' points (rust-lang/rust-by-example#1767)

## rust-lang/rustc-dev-guide

3 commits in 77dbe5782b2488af3bb489ad702eaff438f465bf..ddb8b1309f9e905804cea1e248a4572fed6b464b
2023-11-18 21:08:13 UTC to 2023-11-08 14:43:50 UTC

- Add link for unsize.md (rust-lang/rustc-dev-guide#1825)
- Fix typo in contribution walkthrough (rust-lang/rustc-dev-guide#1824)
- Update documentation for coverage tests (rust-lang/rustc-dev-guide#1823)
@compiler-errors
Rollup merge of rust-lang#118115 - spastorino:fix-old-fn-names, r=com…
aa69088 
…piler-errors

Fix occurrences of old fn names in comment and tracing
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 21, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Nov 21, 2023

📌 Commit aa69088 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 21, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2023
@bors
Copy link
Contributor

bors commented Nov 21, 2023

🔒 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 rollup-smfaoib (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 rollup-smfaoib --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 
Removing src/tools/miri/src/tag_gc.rs
Auto-merging compiler/stable_mir/src/mir/body.rs
CONFLICT (content): Merge conflict in compiler/stable_mir/src/mir/body.rs
Removing compiler/rustc_target/src/spec/targets/x86_64_sun_solaris.rs
Auto-merging compiler/rustc_smir/src/rustc_smir/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 21, 2023
@compiler-errors
Copy link
Member Author

😭

@compiler-errors compiler-errors deleted the rollup-smfaoib branch November 21, 2023 06:30
@bors
Copy link
Contributor

bors commented Nov 21, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@compiler-errors @bors @rustbot @ouz-a @saethlin @nnethercote @calebzulawski @psumbera @spastorino