diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-10 22:00:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-10 22:00:50 +0200 |
| commit | fa3dff3e2436e9323004c3e960098e4acba964e1 (patch) | |
| tree | 5e12deb070fcbd4d5ce162b8a67802ce4c294d76 /compiler/rustc_hir_analysis/src | |
| parent | 75ccd9f63b231212963f62f3d35c83c9cdc26f3e (diff) | |
| parent | 20cebae31203a9781f99081b075abe0dc2504a98 (diff) | |
| download | rust-fa3dff3e2436e9323004c3e960098e4acba964e1.tar.gz rust-fa3dff3e2436e9323004c3e960098e4acba964e1.zip | |
Rollup merge of #131475 - fmease:compiler-mv-obj-safe-dyn-compat-2, r=jieyouxu
Compiler & its UI tests: Rename remaining occurrences of "object safe" to "dyn compatible" Follow-up to #130826. Part of #130852. 1. 1st commit: Fix stupid oversights. Should've been part of #130826. 2. 2nd commit: Rename the unstable feature `object_safe_for_dispatch` to `dyn_compatible_for_dispatch`. Might not be worth the churn, you decide. 3. 3rd commit: Apply the renaming to all UI tests (contents and paths).
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/coherence/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/coherence/mod.rs b/compiler/rustc_hir_analysis/src/coherence/mod.rs index 69d36426447..eea5a16ac6f 100644 --- a/compiler/rustc_hir_analysis/src/coherence/mod.rs +++ b/compiler/rustc_hir_analysis/src/coherence/mod.rs @@ -199,7 +199,7 @@ fn check_object_overlap<'tcx>( for component_def_id in component_def_ids { if !tcx.is_dyn_compatible(component_def_id) { // FIXME(dyn_compat_renaming): Rename test and update comment. - // Without the 'object_safe_for_dispatch' feature this is an error + // Without the 'dyn_compatible_for_dispatch' feature this is an error // which will be reported by wfcheck. Ignore it here. // This is tested by `coherence-impl-trait-for-trait-object-safe.rs`. // With the feature enabled, the trait is not implemented automatically, |