Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d305239

Browse files
committedAug 26, 2024
Auto merge of rust-lang#129595 - matthiaskrgr:rollup-4udn7nn, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#129288 (Use subtyping for `UnsafeFnPointer` coercion, too) - rust-lang#129405 (Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187) - rust-lang#129518 (gitignore: ignore ICE reports regardless of directory) - rust-lang#129519 (Remove redundant flags from `lower_ty_common` that can be inferred from the HIR) - rust-lang#129525 (rustdoc: clean up tuple <-> primitive conversion docs) - rust-lang#129526 (Use `FxHasher` on new solver unconditionally) - rust-lang#129544 (Removes dead code from the compiler) - rust-lang#129553 (add back test for stable-const-can-only-call-stable-const) - rust-lang#129590 (Avoid taking reference of &TyKind) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3f121b9 + d6a3aa4 commit d305239

File tree

44 files changed

+283
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+283
-192
lines changed
 

‎compiler/rustc_monomorphize/src/collector.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1035,9 +1035,9 @@ fn find_vtable_types_for_unsizing<'tcx>(
10351035
}
10361036
};
10371037

1038-
match (&source_ty.kind(), &target_ty.kind()) {
1038+
match (source_ty.kind(), target_ty.kind()) {
10391039
(&ty::Ref(_, a, _), &ty::Ref(_, b, _) | &ty::RawPtr(b, _))
1040-
| (&ty::RawPtr(a, _), &ty::RawPtr(b, _)) => ptr_vtable(*a, *b),
1040+
| (&ty::RawPtr(a, _), &ty::RawPtr(b, _)) => ptr_vtable(a, b),
10411041
(&ty::Adt(def_a, _), &ty::Adt(def_b, _)) if def_a.is_box() && def_b.is_box() => {
10421042
ptr_vtable(source_ty.boxed_ty(), target_ty.boxed_ty())
10431043
}

‎compiler/rustc_passes/messages.ftl

-4
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,6 @@ passes_must_not_suspend =
481481
`must_not_suspend` attribute should be applied to a struct, enum, union, or trait
482482
.label = is not a struct, enum, union, or trait
483483
484-
passes_must_use_async =
485-
`must_use` attribute on `async` functions applies to the anonymous `Future` returned by the function, not the value within
486-
.label = this attribute does nothing, the `Future`s returned by async functions are already `must_use`
487-
488484
passes_must_use_no_effect =
489485
`#[must_use]` has no effect when applied to {$article} {$target}
490486
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.