diff options
| author | bors <bors@rust-lang.org> | 2024-12-02 18:36:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-02 18:36:36 +0000 |
| commit | d49be02cf6d2e2a01264fcdef1e20c826710c0f5 (patch) | |
| tree | 873ce3d38ea75bfa910a38eab39e6d834c13ca17 /compiler/rustc_hir_analysis/src/check/check.rs | |
| parent | 32eea2f4460b06b12acc98050a4211b8c0ccfd67 (diff) | |
| parent | 586591f4d6f656fc2eaf98f33f248bac2b1c3e4f (diff) | |
| download | rust-d49be02cf6d2e2a01264fcdef1e20c826710c0f5.tar.gz rust-d49be02cf6d2e2a01264fcdef1e20c826710c0f5.zip | |
Auto merge of #133760 - GuillaumeGomez:rollup-2c1y8c3, r=GuillaumeGomez
Rollup of 13 pull requests Successful merges: - #133603 (Eliminate magic numbers from expression precedence) - #133715 (rustdoc-json: Include safety of `static`s) - #133721 (rustdoc-json: Add test for `impl Trait for dyn Trait`) - #133725 (Remove `//@ compare-output-lines-by-subset`) - #133730 (Add pretty-printer parenthesis insertion test) - #133736 (Add `needs-target-has-atomic` directive) - #133739 (Re-add myself to rotation) - #133743 (Fix docs for `<[T]>::as_array`.) - #133744 (Fix typo README.md) - #133745 (Remove static HashSet for default IDs list) - #133749 (mir validator: don't store mir phase) - #133751 (remove `Ty::is_copy_modulo_regions`) - #133757 (`impl Default for EarlyDiagCtxt`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src/check/check.rs')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/check.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/check.rs b/compiler/rustc_hir_analysis/src/check/check.rs index e1f4ccca97e..022a6d457ec 100644 --- a/compiler/rustc_hir_analysis/src/check/check.rs +++ b/compiler/rustc_hir_analysis/src/check/check.rs @@ -103,7 +103,7 @@ fn allowed_union_or_unsafe_field<'tcx>( // Fallback case: allow `ManuallyDrop` and things that are `Copy`, // also no need to report an error if the type is unresolved. ty.ty_adt_def().is_some_and(|adt_def| adt_def.is_manually_drop()) - || ty.is_copy_modulo_regions(tcx, typing_env) + || tcx.type_is_copy_modulo_regions(typing_env, ty) || ty.references_error() } }; |