Rollup of 5 pull requests - #160735
Closed
jhpratt wants to merge 59 commits into
Closed
Conversation
don't force intrinsic results into memory
This updates the rust-version file to 7218ebe.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@7218ebe Filtered ref: rust-lang/miri@1b56e03 Upstream diff: rust-lang/rust@73dc916...7218ebe This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
Move command-result printing into a helper and keep CLI loop control at the call site.
Consume Priroda's --dap flag before handing arguments to rustc_driver::run_compiler, then dispatch the freshly-created PrirodaContext to either the existing CLI loop or a new DAP loop stub.
Add FirstUserSourceLocation ResumeMode variant that stops when the interpreter reaches a user-relevant frame with a source location. This gives the DAP frontend an entry-stop primitive that skips Miri-internal and std frames.
Wire `next` and `stepIn` DAP requests to Priroda's existing source-line step. Both commands use the same `handle_step` handler for now; true step-over vs step-in semantics are deferred. Add `stopped_reason` to map `StepResult` variants to DAP `StoppedEventReason` so the editor can distinguish a manual step from a breakpoint hit. Add a `handle_disconnect` handler that sends the `terminated` event and exits the session cleanly. Document the `SourceLocation` span-storage rationale and refine the `SourceLine` resume-mode comment to be clearer about the "no source location → first mapped location" semantics.
When the session receives an unsupported DAP request, return `DispatchOutcome::Continue` instead of `Exit` so the debug adapter keeps running after sending the error response. Remove the `eprintln!` side channel from `handle_unsupported_request` since the framed DAP error response is the single authoritative error-reporting path. Include the command name in the error message string so the DAP client sees which request was rejected.
[Priroda] CI: add clippy check for priroda
miri subtree update Subtree update of `miri` to rust-lang/miri@13801c6. Created using https://github.com/rust-lang/josh-sync. r? @ghost
…folkertdev mir: prohibit projection into scalable vec Fixes rust-lang#160580. Preventing projections into scalable vectors is an oversight from the initial implementation and something we should fix. I'm surprised it caused a stdarch CI failure as reported by rust-lang#160580, as nothing in rustc or stdarch seems to have changed that would have caused that to start happening as far as I can tell. This likely won't fix that stdarch CI failure if it keeps happening, because if there is a projection coming from somewhere then that needs to be fixed - nevertheless, preventing them as in this patch is the right thing to do. I've tested this against the stdarch CI locally.
rustc_parse: A few cleanups to expression parsing next to attributes - The `_with` suffix is removed from `parse_expr_assoc_with` and `parse_expr_assoc_rest_with`. There's no version with `with`, the precedence is always specified. - `parse_expr_res` and `parse_expr_assoc` are split into two versions taking pre-parsed attributes and not taking pre-parsed attributes. The latter versions are more common and can have simpler return type. - "Dead" `parse_outer_attributes` is removed from `parse_expr_prefix_range`, it can never parse anything because the current token is a range separator. - `bump` is moved out of `parse_expr_prefix_common`, it allows reusing `parse_expr_prefix_common` in one more place. - A test covering some previously uncovered attribute parsing cases is added.
tidy: Update Python version requirements to 3.10
…efault, r=clarfonthey Default `RawOsError` to `i16` for 16-bit targets ACP: rust-lang/libs-team#755 Tracking issue: rust-lang#154046 & rust-lang#107792 Fixes rust-lang#160541 # Description As noted by @tgross35, it's likely desirable for `RawOsError` to default to `i16` for 16-bit platforms. Practically, this only affects AVR and MSP430. Since `c_int` is defined as: ```rust crate::cfg_select! { any(target_arch = "avr", target_arch = "msp430") => { pub(super) type c_int = i16; pub(super) type c_uint = u16; } _ => { pub(super) type c_int = i32; pub(super) type c_uint = u32; } } ``` This also ensures for all platforms (excluding UEFI), `RawOsError` is equivalent to `c_int`. Since neither sets of targets had an implementation of `std`, this hasn't yet been litigated. While `RawOsError` is unstable, it seems reasonable to choose a default more likely to align with the underlying OS (if any). --- ## Notes - No AI tooling of any kind was used during the creation of this PR.
Member
Author
|
@bors r+ p=5 |
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 8, 2026
Rollup of 5 pull requests Successful merges: - #160634 (miri subtree update) - #160642 (mir: prohibit projection into scalable vec) - #160303 (rustc_parse: A few cleanups to expression parsing next to attributes) - #160429 (tidy: Update Python version requirements to 3.10) - #160543 (Default `RawOsError` to `i16` for 16-bit targets)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot)Important For more information how to resolve CI failures of this job, visit this link. |
Contributor
|
💔 Test for 5b4f602 failed: CI. Failed jobs:
|
Contributor
|
PR #160642, which is a member of this rollup, was 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
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:
RawOsErrortoi16for 16-bit targets #160543 (DefaultRawOsErrortoi16for 16-bit targets)r? @ghost
Create a similar rollup