Rollup of 9 pull requests#154633
Conversation
…smute_obligation_for_reporting`
The `_umtx_time` flags check in `read_umtx_time` used equality (`flags == abs_time`) instead of bitwise AND (`flags & abs_time != 0`) to detect `UMTX_ABSTIME`. While functionally equivalent for current valid inputs (0 or `UMTX_ABSTIME` alone), the equality check would silently treat an absolute timeout as relative if `flags` had `UMTX_ABSTIME` set alongside other bits. Additionally, unknown flags were silently accepted, whereas the FreeBSD kernel (`umtx_copyin_umtx_time()` in `kern_umtx.c`) rejects them with `EINVAL`. The fix adds validation that rejects unsupported flags and switches to the standard bitwise AND pattern used elsewhere in the codebase (e.g. `O_APPEND`/`O_TRUNC` checks in `fs.rs`).
…threads Unblock all threads with exceeded timeouts at once
This updates the rust-version file to 212b0d4.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 212b0d4 Filtered ref: e8897faa70ed30070b7637e854418aa7aa5ea0d9 Upstream diff: rust-lang/rust@fd0c901...212b0d4 This merge was created using https://github.com/rust-lang/josh-sync.
CONTRIBUTING: explain how to build miri against a locally built rustc
test miri_start with and without std
This updates the rust-version file to 8a70352.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@8a70352 Filtered ref: rust-lang/miri@92c2876 Upstream diff: rust-lang/rust@212b0d4...8a70352 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
./miri toolchain: support overwriting the to-be-installed commit
…rname Add `getpeername` socket shim
This updates the rust-version file to 1174f78.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@1174f78 Filtered ref: rust-lang/miri@9089433 Upstream diff: rust-lang/rust@8a70352...1174f78 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
Windows: Implement MoveFileExW shim
Remove the `compiler-builtins` feature from default because it prevents testing via the default `cargo test` command. It made more sense as a default when `compiler-builtins` was a dependency that some crates added via crates.io, but is no longer needed. The `rustc-dep-of-std` feature is also removed since it doesn't do anything beyond what the `compiler-builtins` feature already does.
miri subtree update Subtree update of `miri` to rust-lang/miri@7662148. Created using https://github.com/rust-lang/josh-sync. r? @ghost
compiler-builtins: Clean up features Remove the `compiler-builtins` feature from default because it prevents testing via the default `cargo test` command. It made more sense as a default when `compiler-builtins` was a dependency that some crates added via crates.io, but is no longer needed. The `rustc-dep-of-std` feature is also removed since it doesn't do anything beyond what the `compiler-builtins` feature already does.
…-normalization-ice, r=lcnr Avoid ICE when param-env normalization leaves unresolved inference variables Fixes rust-lang#153354 Because the impl is already ill-formed, those variables are not fully constrained, so zfully_resolve` fails. We previously treated that as an immediate compiler bug with `span_bug!`, which caused an ICE on invalid input.
…donszelmann,bjorn3 Fix EII function aliases eliminated by LTO Add EII function aliases to `llvm.compiler.used` so that LLVM's LTO passes do not eliminate them. Fixes rust-lang#153645 Tracking issue: rust-lang#125418
…r=jdonszelmann Fix regression when dealing with generics/values with unresolved inference Follow up for rust-lang#151703, fixing regression caused in rollup rust-lang#152825 Forgot to handle generics & unresolved inference variables (as in `get_safe_transmute_error_and_reason`) in my previous PR. This followup checks for them before trying to normalize. I am not completely sure its right approach to have this check cloned but as `select_transmute_obligation_for_reporting` fn just chooses obligation and doesn't actually return an error, this check shouldn't be removed from `get_safe_transmute_error_and_reasnon`. If there is any better solution, let me kmow. Fixes: rust-lang#153755 r? @jdonszelmann
…t-ne-suggestion-span, r=JohnTitor Skip suggestions pointing to macro def for assert_eq Fixes rust-lang#146204 It's better to suggest: ```console help: consider borrowing here --> src/main.rs:3:16 | 3| assert_ne!(&buf, b"----"); | + ``` but i don't want to give a too heuristic but not general enough fix, let suppress them.
delete several `ui/consts` tests * `tests/ui/consts/const.rs`: meaningless * `tests/ui/consts/const-bound.rs`: has nothing to do with const bounds or const at all (anymore?) * `tests/ui/consts/const-enum-tuplestruct2.rs`, `tests/ui/consts/const-enum-tuple2.rs`, `tests/ui/consts/const-enum-tuple.rs`: duplicates of `tests/ui/consts/const-enum-tuplestruct.rs` r? @Kivooeo
…youxu Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename These seem to have been missed when the PR originally merged. cc rust-lang#154004, @GrigorenkoPV
…lcnr remove debug requirement from hooks This change seems useful regardless. It came out of the eager normalize in generalize PR. r? @lcnr
|
@bors r+ rollup=never p=5 |
This comment has been minimized.
This comment has been minimized.
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 37cfa17 (parent) -> e4fdb55 (this PR) Test differencesShow 23 test diffsStage 1
Stage 2
Additionally, 3 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard e4fdb554ad2c0270473181438e338c42b5b30b0c --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
📌 Perf builds for each rolled up PR:
previous master: 37cfa179be In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (e4fdb55): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary -1.8%, secondary 3.4%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 2.3%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 485.095s -> 484.743s (-0.07%) |
Rollup of 9 pull requests Successful merges: - rust-lang#154582 (miri subtree update) - rust-lang#142659 (compiler-builtins: Clean up features) - rust-lang#153574 (Avoid ICE when param-env normalization leaves unresolved inference variables) - rust-lang#153648 (Fix EII function aliases eliminated by LTO) - rust-lang#153790 (Fix regression when dealing with generics/values with unresolved inference) - rust-lang#154551 (Skip suggestions pointing to macro def for assert_eq) - rust-lang#154574 (delete several `ui/consts` tests) - rust-lang#154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename) - rust-lang#154579 (remove debug requirement from hooks)
Successful merges:
ui/conststests #154574 (delete severalui/conststests)mir-opt64-bit panic-abort tests forAlignmentrename #154577 (Updatemir-opt64-bit panic-abort tests forAlignmentrename)r? @ghost
Create a similar rollup