Merge pull request #20063 from lnicola/sync-from-rust

minor: sync from downstream

Author: lnicola

crates/hir-ty/src/layout.rs

@@ -268,7 +268,7 @@ pub fn layout_of_ty_query(
 
             // let pointee = tcx.normalize_erasing_regions(param_env, pointee);
             // if pointee.is_sized(tcx.at(DUMMY_SP), param_env) {
-            //     return Ok(tcx.mk_layout(LayoutS::scalar(cx, data_ptr)));
+            //     return Ok(tcx.mk_layout(LayoutData::scalar(cx, data_ptr)));
             // }
 
             let mut unsized_part = struct_tail_erasing_lifetimes(db, pointee.clone());

rust-version

@@ -1 +1 @@
-27733d46d79f4eb92e240fbba502c43022665735
+58d5e1169056f31553ecf680b009a5770eb0e859