Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better pretty printing for const raw pointers #65859

Closed
wants to merge 10 commits into from
Closed

Better pretty printing for const raw pointers #65859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22586d7
Better pretty printing for const raw pointers
iwikal Oct 27, 2019
6a6ed12
Add the two missing hex digits
iwikal Oct 27, 2019
d322044
Fix raw const ptr test on 32 bit platforms
iwikal Oct 31, 2019
3364c46
Nicer fallback for const pointers to allocations
iwikal Nov 4, 2019
f2cb4d7
Print const refs like const raw pointers
iwikal Nov 4, 2019
6c26bd6
Try to print as slice before ref
iwikal Nov 11, 2019
175c608
Update expected output in mir-opt tests
iwikal Nov 11, 2019
c2dbe44
Bless mir-opt test
iwikal Nov 16, 2019
27d89ec
Merge branch 'master' into pretty-const-pointers
iwikal Nov 16, 2019
1407cdd
Comment which kinds of refs get printed where
iwikal Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/librustc/ty/print/pretty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,10 @@ pub trait PrettyPrinter<'tcx>:
},
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Char) =>
p!(write("{:?}", ::std::char::from_u32(data as u32).unwrap())),
(ConstValue::Scalar(_), ty::RawPtr(_)) => p!(write("{{pointer}}")),
(ConstValue::Scalar(Scalar::Raw { data, size }), ty::RawPtr(_)) => {
iwikal marked this conversation as resolved.
Show resolved Hide resolved
p!(write("0x{:01$x} : ", data, size as usize * 2));
p!(print(ct.ty));
}
(ConstValue::Scalar(Scalar::Ptr(ptr)), ty::FnPtr(_)) => {
let instance = {
let alloc_map = self.tcx().alloc_map.lock();
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/const-generics/raw-ptr-const-param.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ error[E0308]: mismatched types
--> $DIR/raw-ptr-const-param.rs:7:38
|
LL | let _: Const<{15 as *const _}> = Const::<{10 as *const _}>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{pointer}`, found `{pointer}`
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `0x000000000000000f : *const u32`, found `0x000000000000000a : *const u32`
|
= note: expected type `Const<{pointer}>`
found type `Const<{pointer}>`
= note: expected type `Const<0x000000000000000f : *const u32>`
RalfJung marked this conversation as resolved.
Show resolved Hide resolved
found type `Const<0x000000000000000a : *const u32>`

error: aborting due to previous error

Expand Down