diff options
| author | bors <bors@rust-lang.org> | 2023-03-23 07:01:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-23 07:01:03 +0000 |
| commit | 84dd6dfd9d19176cc3c94bc1448a841e44d57890 (patch) | |
| tree | 71e3ad442c58e0eed0c500c7f2cc62e440f9818c /compiler/rustc_ty_utils | |
| parent | cf811810fe8dc92b3ff25e7dd29fb3178c91d409 (diff) | |
| parent | 783f3a1965d46d6f5945b42bdc91b6d0319883f4 (diff) | |
| download | rust-84dd6dfd9d19176cc3c94bc1448a841e44d57890.tar.gz | |
Auto merge of #109503 - matthiaskrgr:rollup-cnp7kdd, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #108954 (rustdoc: handle generics better when matching notable traits)
- #109203 (refactor/feat: refactor identifier parsing a bit)
- #109213 (Eagerly intern and check CrateNum/StableCrateId collisions)
- #109358 (rustc: Remove unused `Session` argument from some attribute functions)
- #109359 (Update stdarch)
- #109378 (Remove Ty::is_region_ptr)
- #109423 (Use region-erased self type during IAT selection)
- #109447 (new solver cleanup + implement coherence)
- #109501 (make link clickable)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ty_utils')
| -rw-r--r-- | compiler/rustc_ty_utils/src/abi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs index 35c9f95eb03..ee5a7909ba3 100644 --- a/compiler/rustc_ty_utils/src/abi.rs +++ b/compiler/rustc_ty_utils/src/abi.rs @@ -539,7 +539,7 @@ fn make_thin_self_ptr<'tcx>( // get a built-in pointer type let mut fat_pointer_layout = layout; 'descend_newtypes: while !fat_pointer_layout.ty.is_unsafe_ptr() - && !fat_pointer_layout.ty.is_region_ptr() + && !fat_pointer_layout.ty.is_ref() { for i in 0..fat_pointer_layout.fields.count() { let field_layout = fat_pointer_layout.field(cx, i); |