Skip to content

Commit 3bf5a84

Browse files
committed
Auto merge of #142817 - matthiaskrgr:rollup-mrobovy, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#142502 (rustdoc_json: improve handling of generic args) - rust-lang/rust#142597 (error on calls to ABIs that cannot be called) - rust-lang/rust#142785 (fix(linkcheck): Build using the lockfile) - rust-lang/rust#142787 (Add diagnostic items for Clippy) - rust-lang/rust#142788 (add doc(alias("AsciiChar")) to core::ascii::Char) - rust-lang/rust#142801 (Use gen blocks in the compiler instead of `from_coroutine`) - rust-lang/rust#142804 (Rename `LayoutS` to `LayoutData` in comments) r? `@ghost` `@rustbot` modify labels: rollup
2 parents daf891e + df90ae3 commit 3bf5a84

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crates/hir-ty/src/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ pub fn layout_of_ty_query(
268268

269269
// let pointee = tcx.normalize_erasing_regions(param_env, pointee);
270270
// if pointee.is_sized(tcx.at(DUMMY_SP), param_env) {
271-
// return Ok(tcx.mk_layout(LayoutS::scalar(cx, data_ptr)));
271+
// return Ok(tcx.mk_layout(LayoutData::scalar(cx, data_ptr)));
272272
// }
273273

274274
let mut unsized_part = struct_tail_erasing_lifetimes(db, pointee.clone());

0 commit comments

Comments
 (0)