Rollup of 6 pull requests#153405
Closed
JonathanBrouwer wants to merge 72 commits intorust-lang:mainfrom
Closed
Conversation
This updates the rust-version file to 3c9faa0.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@3c9faa0 Filtered ref: rust-lang/miri@4003d54 Upstream diff: rust-lang/rust@7bee525...3c9faa0 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This updates the rust-version file to 8387095.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@8387095 Filtered ref: rust-lang/miri@0d092c8 Upstream diff: rust-lang/rust@3c9faa0...8387095 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This updates the rust-version file to e0cb264.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@e0cb264 Filtered ref: rust-lang/miri@291e6e9 Upstream diff: rust-lang/rust@8387095...e0cb264 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
…_files Print a warning when trying to open a file in `/proc`
Fixes RefCell being borrowed mutably twice, see rust-lang/miri#4563 (comment) . There are some places in rustc where the implementation of an argument passed to a tracing span makes a nested tracing call, e.g. [here](https://github.com/rust-lang/rust/blob/f6092f224d2b1774b31033f12d0bee626943b02f/compiler/rustc_const_eval/src/interpret/step.rs#L82-L89)->[here](https://github.com/rust-lang/rust/blob/f6092f224d2b1774b31033f12d0bee626943b02f/compiler/rustc_public/src/ty.rs#L265)->[here](https://github.com/rust-lang/rust/blob/f6092f224d2b1774b31033f12d0bee626943b02f/compiler/rustc_span/src/lib.rs#L2302). This is what caused the crash. Co-authored-by: Ralf Jung <post@ralfj.de>
Miscellaneous tracing fixes and improvements
Remove duplicate "the" in documentation.
This updates the rust-version file to 5fb2ff8.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@5fb2ff8 Filtered ref: rust-lang/miri@7247ca1 Upstream diff: rust-lang/rust@e0cb264...5fb2ff8 This merge was created using https://github.com/rust-lang/josh-sync.
Fix typo in tracing.md for `tracing_separate_thread`
Automatic Rustup
This updates the rust-version file to c78a294.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@c78a294 Filtered ref: rust-lang/miri@1f76d8d Upstream diff: rust-lang/rust@5fb2ff8...c78a294 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This updates the rust-version file to b3869b9.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b3869b9 Filtered ref: 8ca8d84b29d11100879eadb68eb5774f85bb6977 Upstream diff: rust-lang/rust@c78a294...b3869b9 This merge was created using https://github.com/rust-lang/josh-sync.
This also causes bitcode to be saved for the allocator shim with -Csave-temps.
Currently, `Representability::from_cycle_error` prints an "infinite size" error and then returns `Representability::Infinite`, which lets analysis continue. This commit changes it so it just aborts after printing the error. This has two benefits. First, the error messages are better. The error messages we get after continuing are mostly bad -- we usually get another cycle error, e.g. about drop checking or layout, which is not much use to the user, and then abort after that. The only exception is `issue-105231.rs` where a "conflicting implementations" error is now omitted, but there are three other errors before that one so it's no great loss. Second, it allows some simplifications: see the next commit.
This variant was a fallback value used to continue analysis after a `Representability` error, but it's no longer needed thanks to the previous commit. This means `Representability` can now be reduced to a unit type that exists just so `FromCycleError` can exist for the `representability` query. (There is potential for additional cleanups here, but those are beyond the scope of this PR.) This means the `representability`/`representability_adt_ty` queries no longer have a meaningful return value, i.e. they are check-only queries. So they now have a `check_` prefix added. And the `rtry!` macro is no longer needed.
This updates the rust-version file to d933cf4.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@d933cf4 Filtered ref: rust-lang/miri@2989eb7 Upstream diff: rust-lang/rust@ba15679...d933cf4 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This removes the `cycle_fatal` query modifier as it has no effect on its current users. The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
…res, r=JonathanBrouwer Lint unused features *[View all comments](https://triagebot.infra.rust-lang.org/gh-comments/rust-lang/rust/pull/152164)* Fixes rust-lang#44232 Fixes rust-lang#151752 --- This PR records used features through query side effect, then reports unsued features finally.
Refactor WriteBackendMethods a bit
…rrors, r=oli-obk Abort after `representability` errors Doing so results in better error messages and makes the code a bit simpler. Details in individual commits. r? @oli-obk
…tack-true, r=WaffleLapkin
enable `PassMode::Indirect { on_stack: true, .. }` tail call arguments
tracking issue: rust-lang#112788
fixes rust-lang#144855
And add a bunch of tests for tail call target support.
r? WaffleLapkin
miri subtree update Subtree update of `miri` to rust-lang/miri@c37cbf8. Created using https://github.com/rust-lang/josh-sync. r? @ghost
Remove `cycle_fatal` query modifier This removes the `cycle_fatal` query modifier as it has no effect on its current users. The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
the
S-waiting-on-bors
Member
Contributor
|
📋 Only unclosed PRs can be unapproved. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
representabilityerrors #153317 (Abort afterrepresentabilityerrors)PassMode::Indirect { on_stack: true, .. }tail call arguments #153361 (enablePassMode::Indirect { on_stack: true, .. }tail call arguments)cycle_fatalquery modifier #153276 (Removecycle_fatalquery modifier)r? @ghost
Create a similar rollup