Skip to content
forked from rust-lang/rust
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 649b995

Browse files
committedJan 22, 2025
Auto merge of rust-lang#135893 - matthiaskrgr:rollup-2qqo647, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#133372 (Refactor dyn-compatibility error and suggestions) - rust-lang#134396 (AIX: use align 8 for byval parameter) - rust-lang#135156 (Make our `DIFlags` match `LLVMDIFlags` in the LLVM-C API) - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors) - rust-lang#135823 (make UI tests that use `--test` work on panic=abort targets) - rust-lang#135850 (Update the `wasm-component-ld` tool) - rust-lang#135858 (rustdoc: Finalize dyn compatibility renaming) - rust-lang#135866 (Don't pick `T: FnPtr` nested goals as the leaf goal in diagnostics for new solver) - rust-lang#135874 (Enforce that all spans are lowered in ast lowering) - rust-lang#135875 (Remove `Copy` bound from `enter_forall`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents dee7d0e + e0b4ba3 commit 649b995

File tree

244 files changed

+2141
-1461
lines changed

Some content is hidden

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

244 files changed

+2141
-1461
lines changed
 

‎compiler/rustc_feature/src/removed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ declare_features! (
163163
/// then removed. But there was no utility storing it separately, so now
164164
/// it's in this list.
165165
(removed, no_stack_check, "1.0.0", None, None),
166-
/// Allows making `dyn Trait` well-formed even if `Trait` is not dyn-compatible (object safe).
166+
/// Allows making `dyn Trait` well-formed even if `Trait` is not dyn compatible (object safe).
167167
/// Renamed to `dyn_compatible_for_dispatch`.
168168
(removed, object_safe_for_dispatch, "1.83.0", Some(43561),
169169
Some("renamed to `dyn_compatible_for_dispatch`")),

‎compiler/rustc_feature/src/unstable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ declare_features! (
272272
(unstable, doc_notable_trait, "1.52.0", Some(45040)),
273273
/// Allows using the `may_dangle` attribute (RFC 1327).
274274
(unstable, dropck_eyepatch, "1.10.0", Some(34761)),
275-
/// Allows making `dyn Trait` well-formed even if `Trait` is not dyn-compatible[^1].
275+
/// Allows making `dyn Trait` well-formed even if `Trait` is not dyn compatible[^1].
276276
/// In that case, `dyn Trait: Trait` does not hold. Moreover, coercions and
277277
/// casts in safe Rust to `dyn Trait` for such a `Trait` is also forbidden.
278278
///
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.