diff options
| author | bors <bors@rust-lang.org> | 2025-01-31 20:16:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-31 20:16:46 +0000 |
| commit | 854f22563c8daf92709fae18ee6aed52953835cd (patch) | |
| tree | 5373bfa06515d77ea3abd660778996edd62ae68b /compiler/rustc_hir_analysis/src/coherence/mod.rs | |
| parent | aa4cfd0809064503c69795e8e83ad067ad9e11a1 (diff) | |
| parent | fb67f3a2bff7e0b6c3e704354432e33af100eee8 (diff) | |
| download | rust-854f22563c8daf92709fae18ee6aed52953835cd.tar.gz rust-854f22563c8daf92709fae18ee6aed52953835cd.zip | |
Auto merge of #136350 - matthiaskrgr:rollup-6eqfyvh, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #134531 ([rustdoc] Add `--extract-doctests` command-line flag) - #135860 (Compiler: Finalize dyn compatibility renaming) - #135992 (Improve documentation when adding a new target) - #136194 (Support clobber_abi in BPF inline assembly) - #136325 (Delay a bug when indexing unsized slices) - #136326 (Replace our `LLVMRustDIBuilderRef` with LLVM-C's `LLVMDIBuilderRef`) - #136330 (Remove unnecessary hooks) - #136336 (Overhaul `rustc_middle::util`) - #136341 (Remove myself from vacation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src/coherence/mod.rs')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/coherence/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_hir_analysis/src/coherence/mod.rs b/compiler/rustc_hir_analysis/src/coherence/mod.rs index b1f73a903d8..b9ef166fc3f 100644 --- a/compiler/rustc_hir_analysis/src/coherence/mod.rs +++ b/compiler/rustc_hir_analysis/src/coherence/mod.rs @@ -199,10 +199,9 @@ 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 '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`. + // This is tested by `coherence-impl-trait-for-trait-dyn-compatible.rs`. // With the feature enabled, the trait is not implemented automatically, // so this is valid. } else { |