Rollup of 10 pull requests #126235
Closed
Rollup of 10 pull requests #126235
Conversation
This file contains 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
I found these by setting the `unused_crate_dependencies` lint temporarily to `Warn`.
…, r=jieyouxu Migrate `run-make/short-ice` to `rmake` Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
…r=jackh726 Remove some unused crate dependencies. I found these by setting the `unused_crate_dependencies` lint temporarily to `Warn`. r? `@jackh726`
…-result, r=compiler-errors Fix ICE due to `unwrap` in `probe_for_name_many` Fixes rust-lang#125876 Now `probe_for_name_many` bubbles up the error returned by `probe_op` instead of calling `unwrap` on it.
…r=oli-obk ScalarInt: size mismatches are a bug, do not delay the panic Cc [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/146212-t-compiler.2Fconst-eval/topic/Why.20are.20ScalarInt.20to.20iN.2FuN.20methods.20fallible.3F) r? `@oli-obk`
…=oli-obk interpret: do not ICE on padded non-pow2 SIMD vectors Fixes rust-lang/miri#3458 r? `@oli-obk`
Fix `NonZero` doctest inconsistencies
<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.
This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using
r? <reviewer name>
-->
`NonZero`'s doctests contain both `?` and `.unwrap()` with no obvious reason for the difference, so this changes all of them to `?`. Also removes an explicit `std::num::NonZero`.
…=jieyouxu migrate tests/run-make/llvm-outputs to use rmake.rs part of rust-lang#121876 <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r? <reviewer name> -->
fix: build on haiku
## What does this PR do
The std is broken on haiku, this PR fixes it.
## To reproduce the issue
```sh
$ cargo +nightly --version
cargo 1.81.0-nightly (b1feb75d0 2024-06-07)
$ cargo new hello
$ cd hello
$ cargo +nightly check -Zbuild-std --target x86_64-unknown-haiku -q
error[E0433]: failed to resolve: use of undeclared crate or module `std`
--> ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/pal/unix/os.rs:468:13
|
468 | std::ptr::null_mut(),
| ^^^ use of undeclared crate or module `std`
|
help: consider importing one of these items
|
8 + use core::ptr;
|
8 + use crate::ptr;
|
help: if you import `ptr`, refer to it directly
|
468 - std::ptr::null_mut(),
468 + ptr::null_mut(),
|
error[E0433]: failed to resolve: use of undeclared crate or module `std`
--> ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/pal/unix/os.rs:470:13
|
470 | std::ptr::null_mut(),
| ^^^ use of undeclared crate or module `std`
|
help: consider importing one of these items
|
8 + use core::ptr;
```
…lcnr
Add explanatory note to async block type mismatch error
The async block type mismatch error might leave the user wondering as to why it occurred. The new note should give them the needed context.
Changes this diagnostic:
```
error[E0308]: mismatched types
--> src/main.rs:5:23
|
2 | let a = async { 1 };
| ----------- the expected `async` block
3 | let b = async { 2 };
| ----------- the found `async` block
4 |
5 | let bad = vec![a, b];
| ^ expected `async` block, found a different `async` block
|
= note: expected `async` block `{async block@src/main.rs:2:13: 2:24}`
found `async` block `{async block@src/main.rs:3:13: 3:24}`
```
to this:
```
error[E0308]: mismatched types
--> src/main.rs:5:23
|
2 | let a = async { 1 };
| ----------- the expected `async` block
3 | let b = async { 2 };
| ----------- the found `async` block
4 |
5 | let bad = vec![a, b];
| ^ expected `async` block, found a different `async` block
|
= note: expected `async` block `{async block@src/main.rs:2:13: 2:24}`
found `async` block `{async block@src/main.rs:3:13: 3:24}`
= note: no two async blocks, even if identical, have the same type
= help: consider pinning your async block and and casting it to a trait object
```
Fixes rust-lang#125737
…test, r=Kobzol run-make: add `run_in_tmpdir` self-test Add a basic sanity test for `run_in_tmpdir` to make sure that files (including read-only files) and directories created inside the "scratch" tmpdir are removed after the closure returns. r? ghost (while i run a try job) try-job: x86_64-msvc
rustbot
added
A-query-system
rustbot
added
WG-trait-system-refactor
|
@bors r+ rollup=never p=10 |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 10, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#126036 (Migrate `run-make/short-ice` to `rmake`) - rust-lang#126063 (Remove some unused crate dependencies.) - rust-lang#126115 (Fix ICE due to `unwrap` in `probe_for_name_many`) - rust-lang#126159 (ScalarInt: size mismatches are a bug, do not delay the panic) - rust-lang#126184 (interpret: do not ICE on padded non-pow2 SIMD vectors) - rust-lang#126191 (Fix `NonZero` doctest inconsistencies) - rust-lang#126211 (migrate tests/run-make/llvm-outputs to use rmake.rs) - rust-lang#126212 (fix: build on haiku) - rust-lang#126215 (Add explanatory note to async block type mismatch error) - rust-lang#126223 (run-make: add `run_in_tmpdir` self-test) r? `@ghost` `@rustbot` modify labels: rollup
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
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:
run-make/short-icetormake#126036 (Migraterun-make/short-icetormake)unwrapinprobe_for_name_many#126115 (Fix ICE due tounwrapinprobe_for_name_many)NonZerodoctest inconsistencies #126191 (FixNonZerodoctest inconsistencies)run_in_tmpdirself-test #126223 (run-make: addrun_in_tmpdirself-test)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup