Skip to content

miri subtree update - #163534

Merged
rust-bors[bot] merged 46 commits into
rust-lang:mainfrom
RalfJung:miri
Oct 1, 2026
Merged

rust-bors[bot] merged 46 commits into
rust-lang:mainfrom
RalfJung:miri

Conversation

@RalfJung

Copy link
Copy Markdown
Member

The Miri Cronjob Bot and others added 30 commits September 24, 2026 04:34
This updates the rust-version file to 3670d25.
This updates the rust-version file to 0d38a84.
…s-zed

Disable rust-analyzer diagnostics for Zed
Shimmed TCP sockets are now always backed by a host socket. Before
`connect` or `listen` is invoked on the shimmed socket, we just have a
`socket2::Socket`. This is socket is then coverted to a `mio::TcpStream`
or `mio::TcpListener` after encountering a `connect` or `listen`,
respectively.

Furthermore, a socket can always be viewed as a `socket2::SockRef`. This
allows us to support more socket options than mio provides on its TCP
socket abstractions.
Extend TCP socket shim to use `socket2` abstractions
…tics-helix

Disable rust-analyzer diagnostics for Helix
This updates the rust-version file to c231371.
When running on a native host, the `connect` might succeed immediately
which would cause some of the non-blocking socket tests to fail.

This assertion was only needed to ensure that the `connect` did not fail
for any real reason. Thus, the assertion has been adjusted to not fail
when the `connect` succeeds immediately.
This updates the rust-version file to 2269776.
…ect-assertion

Don't assert EINPROGRESS for non-blocking `connect` on TCP sockets
This updates the rust-version file to 5d89371.
… and `_mm_mulhi_epu16`

These are being used again (rust-lang/stdarch#2219) due to performance regression of the generic implementation

This partially reverts rust-lang#116609
miri: implement again shims for LLVM intrinsics for `_mm_mulhi_epi16` and `_mm_mulhi_epu16`
@rustbot

rustbot commented Sep 30, 2026

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

miri is developed in its own repository. If the Miri part of this change can be broken out, consider making this change to rust-lang/miri instead. However, if Miri needs adjusting for rustc changes, just ignore this message.

cc @rust-lang/miri

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2026
@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+ p=1

@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5658d6b has been tentatively approved by RalfJung

It will be put into the queue for this repository once PR CI succeeds.

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

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #163483 (Bump bootstrap compiler to 1.100.0 beta)
 - #159798 (Attribute documentation for cfg_attr)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)

Failed merges:

 - #163547 ([beta] rustfmt backport)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 30, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
…uwer

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #159798 (Attribute documentation for cfg_attr)
 - #162921 (make mips64 `Complex` GCC-compatible)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)
rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
…uwer

Rollup of 18 pull requests

Successful merges:

 - #163532 (rustc_codegen_cranelift subtree update)
 - #163534 (miri subtree update)
 - #163279 (const and NonZero impl for clamp_magnitude())
 - #162900 (Some refactorings around metadata encoding)
 - #163455 (Don't use the metadata based crate_hash for rustdoc runs)
 - #159798 (Attribute documentation for cfg_attr)
 - #162921 (make mips64 `Complex` GCC-compatible)
 - #163368 (Don't build format string suggestions from `concat!` offsets)
 - #163375 (Update expect messages in library/std/src/os/unix/net/ following Rust's `expect` guidance)
 - #163405 (Remove some #[linkage] options)
 - #163470 (Miscellaneous attr error stuff)
 - #163489 (expose Rc::is_unique)
 - #163492 (x86 and x86_64: cleanup some callconv code)
 - #163496 (cycle handling: mirror old solver)
 - #163509 (Use more default field values in `Resolver`)
 - #163519 (Forbid  `Reborrow` impls for types with destructors)
 - #163520 (Cast cleanups)
 - #163524 (Document `Result` case for the `arena_cache` query modifier)
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 1, 2026
@rust-bors

rust-bors Bot commented Oct 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: RalfJung
Duration: 2h 55m 15s
Pushing 012c0bd to main...

@rust-bors
rust-bors Bot merged commit 012c0bd into rust-lang:main Oct 1, 2026
14 checks passed
@rustbot rustbot added this to the 1.101.0 milestone Oct 1, 2026
@github-actions

github-actions Bot commented Oct 1, 2026

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 6006fd0 (parent) -> 012c0bd (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 012c0bd4d516934012c9a1ecb26e9eb283d2ed75 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-x86_64-netbsd: 1h 2m -> 1h 37m (+56.1%)
  2. test-i686-msvc: 1h 44m -> 2h 33m (+47.7%)
  3. dist-x86_64-illumos: 1h 24m -> 2h (+43.3%)
  4. dist-arm-linux-gnueabi: 1h 3m -> 1h 30m (+41.6%)
  5. test-x86_64-gnu-debug: 2h 10m -> 1h 23m (-36.4%)
  6. test-x86_64-gnu-stdlib-semver-check: 16m 43s -> 10m 44s (-35.8%)
  7. test-x86_64-gnu-llvm-22-2: 1h 38m -> 1h 3m (-34.9%)
  8. test-x86_64-gnu-gcc-core-tests: 18m 50s -> 12m 19s (-34.6%)
  9. test-x86_64-gnu-parallel-frontend: 2h 10m -> 1h 25m (-34.3%)
  10. test-x86_64-gnu-llvm-21-3: 1h 57m -> 1h 18m (-32.8%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (012c0bd): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

This perf run didn't have relevant results for this metric.

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 490.236s -> 490.746s (0.10%)
Artifact size: 406.45 MiB -> 406.55 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants