about summary refs log tree commit diff
path: root/src/tools/rust-analyzer
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2025-06-23 12:17:31 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2025-06-23 12:17:31 +0300
commit3c4a690d018bebe98cf5ebfdfbf4388d131121c9 (patch)
tree8ba69fe791545d69bd1d6fd93318b8bc76449a18 /src/tools/rust-analyzer
parent3db7cffd54008792421a801e80701465c8977abd (diff)
parent1052ddda964811c25823aa7285595f7085392b36 (diff)
downloadrust-3c4a690d018bebe98cf5ebfdfbf4388d131121c9.tar.gz
rust-3c4a690d018bebe98cf5ebfdfbf4388d131121c9.zip
Merge from rust-lang/rust
Diffstat (limited to 'src/tools/rust-analyzer')
-rw-r--r--src/tools/rust-analyzer/crates/hir-ty/src/layout.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/layout.rs b/src/tools/rust-analyzer/crates/hir-ty/src/layout.rs
index c253fe25672..c58bd1b773e 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/layout.rs
+++ b/src/tools/rust-analyzer/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());