Skip to content

Rollup of 9 pull requests #126240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6d87fc8
Fix ICE due to `unwrap` in `probe_for_name_many`
gurry Jun 8, 2024
d5fb825
interpret: do not ICE on padded non-pow2 SIMD vectors
RalfJung Jun 9, 2024
041e204
fix `NonZero` doctest inconsistencies
ivan-shrimp Jun 9, 2024
63ec8dd
fix: build on haiku
SteveLauC Jun 10, 2024
91f5530
migrate tests/run-make/llvm-outputs to use rmake.rs
lolbinarycat Jun 10, 2024
29629d0
Remove some unused crate dependencies.
nnethercote Jun 5, 2024
256387b
run-make: add run_in_tmpdir self-test
jieyouxu Jun 10, 2024
3c57ea0
ScalarInt: size mismatches are a bug, do not delay the panic
RalfJung Jun 8, 2024
251d2d0
Add explanatory note to async block type mismatch error
gurry Jun 10, 2024
1832ee0
Rollup merge of #126063 - nnethercote:rm-unused-crate-deps, r=jackh726
matthiaskrgr Jun 10, 2024
bcc6fda
Rollup merge of #126115 - gurry:125876-ice-unwrap-probe-many-result, …
matthiaskrgr Jun 10, 2024
2d7f7ff
Rollup merge of #126159 - RalfJung:scalarint-size-mismatch, r=oli-obk
matthiaskrgr Jun 10, 2024
07bb7ca
Rollup merge of #126184 - RalfJung:interpret-simd-nonpow2, r=oli-obk
matthiaskrgr Jun 10, 2024
146f4b3
Rollup merge of #126191 - ivan-shrimp:nonzero_doc, r=scottmcm
matthiaskrgr Jun 10, 2024
61eb29e
Rollup merge of #126211 - lolbinarycat:llvm-outputs-rmake, r=jieyouxu
matthiaskrgr Jun 10, 2024
b595078
Rollup merge of #126212 - SteveLauC:fix/haiku, r=joboet
matthiaskrgr Jun 10, 2024
f0adebc
Rollup merge of #126215 - gurry:125737-bad-err-anon-futs, r=lcnr
matthiaskrgr Jun 10, 2024
d762ef1
Rollup merge of #126223 - jieyouxu:rmake-run-in-tmpdir-self-test, r=K…
matthiaskrgr Jun 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
diag.note("no two closures, even if identical, have the same type");
diag.help("consider boxing your closure and/or using it as a trait object");
}
(ty::Coroutine(def_id1, ..), ty::Coroutine(def_id2, ..))
if self.tcx.coroutine_is_async(def_id1)
&& self.tcx.coroutine_is_async(def_id2) =>
{
diag.note("no two async blocks, even if identical, have the same type");
diag.help(
"consider pinning your async block and casting it to a trait object",
);
}
(ty::Alias(ty::Opaque, ..), ty::Alias(ty::Opaque, ..)) => {
// Issue #63167
diag.note("distinct uses of `impl Trait` result in different opaque types");
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/async-await/coroutine-desc.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ LL | fun(async {}, async {});
|
= note: expected `async` block `{async block@$DIR/coroutine-desc.rs:10:9: 10:17}`
found `async` block `{async block@$DIR/coroutine-desc.rs:10:19: 10:27}`
= note: no two async blocks, even if identical, have the same type
= help: consider pinning your async block and casting it to a trait object
note: function defined here
--> $DIR/coroutine-desc.rs:8:4
|
Expand Down Expand Up @@ -51,6 +53,8 @@ LL | fun((async || {})(), (async || {})());
|
= note: expected `async` closure body `{async closure body@$DIR/coroutine-desc.rs:14:19: 14:21}`
found `async` closure body `{async closure body@$DIR/coroutine-desc.rs:14:36: 14:38}`
= note: no two async blocks, even if identical, have the same type
= help: consider pinning your async block and casting it to a trait object
note: function defined here
--> $DIR/coroutine-desc.rs:8:4
|
Expand Down