Skip to content

miri subtree update - #161186

Merged
rust-bors[bot] merged 31 commits into
rust-lang:mainfrom
RalfJung:miri
Aug 17, 2026
Merged

miri subtree update#161186
rust-bors[bot] merged 31 commits into
rust-lang:mainfrom
RalfJung:miri

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Subtree update of miri to rust-lang/miri@ac0adc4.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

RalfJung and others added 30 commits August 5, 2026 11:05
This updates the rust-version file to 7dfb9d0.
This updates the rust-version file to 4667d75.
…erver

[Priroda] Add TCP DAP mode for VS Code attach
Document the current startup behavior for clients that send `attach` after `initialize`.

The VS Code debugServer template needs this path once it uses an editor-provided debug type with an attach request, so make the existing rejection visible before changing the adapter state machine.
Treat DAP `attach` as the same startup transition as `launch`. Priroda is already running by the time a `debugServer` client connects, so this does not add a second session model or any target-selection semantics.

This makes the VS Code template usable with `request: "attach"`, which is the extension-free path through VS Code's built-in debug type.
Document how the DAP frontend currently reacts when VS Code's JavaScript debugger sends an extension request that `emmy_dap_types` cannot deserialize.

The following valid DAP messages are included in the input so the next commit can show that Priroda keeps serving after the unknown command instead of ending the session.
Skip requests that `emmy_dap_types` cannot deserialize after reading their length-prefixed message body. That leaves the transport positioned at the next message, so Priroda can keep serving the DAP subset it understands.

This is needed by the extension-free VS Code debugServer flow because the built-in JavaScript debugger can send extension commands such as `enableNetworking` before the ordinary Priroda handshake. The handler still records this as a FIXME so we can replace the stderr-only skip with a proper DAP error response once the protocol crate can represent unknown commands.
Use VS Code's built-in node debug type as the editor-side entry point for the debugServer template. The debugServer setting still connects VS Code to Priroda's already-running DAP server, so the Node adapter is not spawned.

Local testing had been masked by an experimental Priroda VS Code extension that contributed a `priroda` debug type. After removing that extension, the previous template depended on hidden editor state and was not reproducible from the checked-in files alone.

Switching the template to `type: "node"` and `request: "attach"` makes the setup work on a clean VS Code install, together with Priroda accepting DAP `attach` and skipping js-debug extension requests that are not part of Priroda's protocol.
add some more missing io::Error variants
…erver-extension-free

[Priroda] Make VS Code debugServer setup extension-free
This updates the rust-version file to 67854e5.
@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@rust-bors

rust-bors Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 6c9c80c has been approved by RalfJung

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 16, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 16, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 16, 2026
…uwer

Rollup of 17 pull requests

Successful merges:

 - #160529 (Upgrade and deduplicate dependencies)
 - #161017 (Library: enforce clippy deref lints in CI)
 - #160416 (std: fix unix socket address truncation without a trailing NUL)
 - #161006 ([CI] Build newer `binutils` before building `gcc`)
 - #161141 (Add documentation for BPF targets)
 - #161157 (bootstrap: Move several items out of the crate root)
 - #161185 (std: guard against unwinds in queue-based `Once`)
 - #161186 (miri subtree update)
 - #159855 (std: retry waitid on EINTR in the pidfd wait path)
 - #161053 (Add regression test for borrow of array drop type in const)
 - #161073 (Add regression test for path printing with infinitely many visible names)
 - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation)
 - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`)
 - #161136 (Add BPF test for Rust ABI stack arguments)
 - #161146 (Switch to c8a EC2 runner for auto merges)
 - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore))
 - #161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)
@JonathanBrouwer

Copy link
Copy Markdown
Contributor

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #161188 (comment)

@rust-bors rust-bors Bot 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 Aug 16, 2026
@rust-bors

rust-bors Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#161188), which was unapproved.

View changes since this unapproval

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

^ The job that failed in autojobs passed as a PR job on the rollup, this may be spurious but would like a human to take a look at it, as I"ve not seen the failure before

@RalfJung

Copy link
Copy Markdown
Member Author

Seems unlikely that it's this sync.
@bors try jobs=x86_64-gnu-miri

@rust-bors

rust-bors Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

⌛ Trying commit 6c9c80c with merge 1394d61

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/31969919201

rust-bors Bot pushed a commit that referenced this pull request Aug 16, 2026
miri subtree update


try-job: x86_64-gnu-miri
@RalfJung

Copy link
Copy Markdown
Member Author

Ah, that is the native run of the test. The test checks for 1 or -1 but memcmp is allowed to return any non-zero value. Not sure why that was not a problem before, it's not new in this sync either...

@RalfJung

Copy link
Copy Markdown
Member Author

@bors try cancel

@rust-bors

rust-bors Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

Try build cancelled. Cancelled workflows:

Hint: if you want to run another try build, you do not need to manually cancel the previous one. Just run @bors try and bors will cancel the previous build automatically.

@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@rust-bors

rust-bors Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2e79127 has been approved by RalfJung

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 16, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 16, 2026
…uwer

Rollup of 17 pull requests

Successful merges:

 - #161017 (Library: enforce clippy deref lints in CI)
 - #160416 (std: fix unix socket address truncation without a trailing NUL)
 - #161006 ([CI] Build newer `binutils` before building `gcc`)
 - #161141 (Add documentation for BPF targets)
 - #161157 (bootstrap: Move several items out of the crate root)
 - #161185 (std: guard against unwinds in queue-based `Once`)
 - #161186 (miri subtree update)
 - #159855 (std: retry waitid on EINTR in the pidfd wait path)
 - #160478 (diagnostics: Suggest fn binding type for unstable closure for<> binders)
 - #161053 (Add regression test for borrow of array drop type in const)
 - #161073 (Add regression test for path printing with infinitely many visible names)
 - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation)
 - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`)
 - #161136 (Add BPF test for Rust ABI stack arguments)
 - #161146 (Switch to c8a EC2 runner for auto merges)
 - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore))
 - #161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)
@rust-bors
rust-bors Bot merged commit 7145327 into rust-lang:main Aug 17, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 17, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 17, 2026
Rollup merge of #161186 - RalfJung:miri, r=RalfJung

miri subtree update

Subtree update of `miri` to rust-lang/miri@ac0adc4.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
@RalfJung
RalfJung deleted the miri branch August 17, 2026 07:20
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Aug 17, 2026
…uwer

Rollup of 17 pull requests

Successful merges:

 - rust-lang/rust#161017 (Library: enforce clippy deref lints in CI)
 - rust-lang/rust#160416 (std: fix unix socket address truncation without a trailing NUL)
 - rust-lang/rust#161006 ([CI] Build newer `binutils` before building `gcc`)
 - rust-lang/rust#161141 (Add documentation for BPF targets)
 - rust-lang/rust#161157 (bootstrap: Move several items out of the crate root)
 - rust-lang/rust#161185 (std: guard against unwinds in queue-based `Once`)
 - rust-lang/rust#161186 (miri subtree update)
 - rust-lang/rust#159855 (std: retry waitid on EINTR in the pidfd wait path)
 - rust-lang/rust#160478 (diagnostics: Suggest fn binding type for unstable closure for<> binders)
 - rust-lang/rust#161053 (Add regression test for borrow of array drop type in const)
 - rust-lang/rust#161073 (Add regression test for path printing with infinitely many visible names)
 - rust-lang/rust#161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation)
 - rust-lang/rust#161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`)
 - rust-lang/rust#161136 (Add BPF test for Rust ABI stack arguments)
 - rust-lang/rust#161146 (Switch to c8a EC2 runner for auto merges)
 - rust-lang/rust#161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore))
 - rust-lang/rust#161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants