Skip to content

Commit d1852e1

Browse files
committed
Respond to review feedback
1 parent 8500274 commit d1852e1

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

src/etc/natvis/liballoc.natvis

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<Item Name="[len]" ExcludeView="simple">vec.len</Item>
4949
<Item Name="[capacity]" ExcludeView="simple">vec.buf.cap</Item>
5050
<Synthetic Name="[chars]">
51+
<DisplayString>{(char*)vec.buf.ptr.pointer,[vec.len]s8}</DisplayString>
5152
<Expand>
5253
<ArrayItems>
5354
<Size>vec.len</Size>

src/etc/natvis/libcore.natvis

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
<Type Name="core::time::Duration">
157157
<DisplayString>{secs,d}s {nanos,d}ns</DisplayString>
158158
<Expand>
159-
<Item Name="seconds">secs</Item>
160-
<Item Name="nanoseconds">nanos</Item>
159+
<Item Name="seconds">secs,d</Item>
160+
<Item Name="nanoseconds">nanos,d</Item>
161161
</Expand>
162162
</Type>
163163
</AutoVisualizer>

src/etc/natvis/libstd.natvis

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<DisplayString>{(char*)inner.data_ptr}</DisplayString>
7878
<Expand>
7979
<Synthetic Name="[chars]">
80+
<DisplayString>{(char*)inner.data_ptr}</DisplayString>
8081
<Expand>
8182
<ArrayItems>
8283
<Size>inner.length</Size>
@@ -106,6 +107,7 @@
106107
<DisplayString>{(char*)inner.inner.bytes.buf.ptr.pointer,[inner.inner.bytes.len]}</DisplayString>
107108
<Expand>
108109
<Synthetic Name="[chars]">
110+
<DisplayString>{(char*)inner.inner.bytes.buf.ptr.pointer,[inner.inner.bytes.len]}</DisplayString>
109111
<Expand>
110112
<ArrayItems>
111113
<Size>inner.inner.bytes.len</Size>

src/test/debuginfo/duration-type.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// cdb-command: dx duration
99
// cdb-check:duration : 5s 12ns [Type: core::time::Duration]
1010
// cdb-check: [<Raw View>] [Type: core::time::Duration]
11-
// cdb-check: seconds : 0x5 [Type: unsigned __int64]
12-
// cdb-check: nanoseconds : 0xc [Type: unsigned int]
11+
// cdb-check: seconds : 5 [Type: unsigned __int64]
12+
// cdb-check: nanoseconds : 12 [Type: unsigned int]
1313

1414
use std::time::Duration;
1515

src/test/debuginfo/marker-types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// cdb-command: dx nonnull
99
// cdb-check:nonnull : NonNull(0x[...]: 0xc) [Type: core::ptr::non_null::NonNull<u32>]
1010
// cdb-check: [<Raw View>] [Type: core::ptr::non_null::NonNull<u32>]
11-
// cdb-checK: 0xc [Type: unsigned int]
11+
// cdb-check: 0xc [Type: unsigned int]
1212

1313
// cdb-command: dx manuallydrop
1414
// cdb-check:manuallydrop : 12345 [Type: core::mem::manually_drop::ManuallyDrop<i32>]
@@ -19,7 +19,7 @@
1919
// cdb-check: [<Raw View>] [Type: core::pin::Pin<ref_mut$<alloc::string::String> >]
2020
// cdb-check: [len] : 0x4 [Type: unsigned __int64]
2121
// cdb-check: [capacity] : 0x4 [Type: unsigned __int64]
22-
// cdb-check: [chars]
22+
// cdb-check: [chars] : "this"
2323

2424
use std::mem::ManuallyDrop;
2525
use std::pin::Pin;

src/test/debuginfo/pretty-std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
// cdb-command: dx os_string
114114
// cdb-check:os_string : "IAMA OS string 😃" [Type: std::ffi::os_str::OsString]
115115
// cdb-check: [<Raw View>] [Type: std::ffi::os_str::OsString]
116-
// cdb-check: [chars]
116+
// cdb-check: [chars] : "IAMA OS string 😃"
117117

118118
// cdb-command: dx some
119119
// cdb-check:some : Some [Type: enum$<core::option::Option<i16> >]

0 commit comments

Comments
 (0)