Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6eb9f2d

Browse files
committedFeb 8, 2023
Auto merge of #107788 - matthiaskrgr:rollup-mw10sli, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #107656 (Bump rust-installer) - #107757 (Allow automatically creating vscode `settings.json` with `x setup`) - #107769 (Rename `PointerSized` to `PointerLike`) - #107770 (rustdoc: use a newline instead of `<br>` to format code headers) - #107771 (Tweak ICE message) - #107773 (Clearly signal purpose of the yaml template) - #107776 (Docs: Fix format of headings in String::reserve) - #107779 (Remove astconv usage in diagnostic) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7ba4e95 + fe26182 commit 6eb9f2d

File tree

53 files changed

+375
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+375
-165
lines changed
 

‎.github/ISSUE_TEMPLATE/ice.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Internal Compiler Error (Structured form)
1+
name: Internal Compiler Error (for use by automated tooling)
22
description: For now, you'll want to use the other ICE template, as GitHub forms have strict limits on the size of fields so backtraces cannot be pasted directly.
33
labels: ["C-bug", "I-ICE", "T-compiler"]
44
title: "[ICE]: "

‎compiler/rustc_const_eval/src/interpret/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
126126
let vtable = self.get_vtable_ptr(src.layout.ty, data.principal())?;
127127
let vtable = Scalar::from_maybe_pointer(vtable, self);
128128
let data = self.read_immediate(src)?.to_scalar();
129-
let _assert_pointer_sized = data.to_pointer(self)?;
129+
let _assert_pointer_like = data.to_pointer(self)?;
130130
let val = Immediate::ScalarPair(data, vtable);
131131
self.write_immediate(val, dest)?;
132132
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.