diff options
| author | Ben Kimock <kimockb@gmail.com> | 2024-08-09 21:54:48 -0400 |
|---|---|---|
| committer | Ben Kimock <kimockb@gmail.com> | 2024-08-11 16:51:22 -0400 |
| commit | 28a8301de98f9b8d8a3d34d554c319a4c6204f62 (patch) | |
| tree | ffce67f3bbce1815108e3123c64b39d980420c2c /src/etc/natvis | |
| parent | da15248d26076fe3a6482dd1e25c54c2cc1ef577 (diff) | |
| download | rust-28a8301de98f9b8d8a3d34d554c319a4c6204f62.tar.gz rust-28a8301de98f9b8d8a3d34d554c319a4c6204f62.zip | |
Fix debuginfo providers/tests
Diffstat (limited to 'src/etc/natvis')
| -rw-r--r-- | src/etc/natvis/liballoc.natvis | 18 | ||||
| -rw-r--r-- | src/etc/natvis/libstd.natvis | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/etc/natvis/liballoc.natvis b/src/etc/natvis/liballoc.natvis index da307809f7b..49d82dfad82 100644 --- a/src/etc/natvis/liballoc.natvis +++ b/src/etc/natvis/liballoc.natvis @@ -4,10 +4,10 @@ <DisplayString>{{ len={len} }}</DisplayString> <Expand> <Item Name="[len]" ExcludeView="simple">len</Item> - <Item Name="[capacity]" ExcludeView="simple">buf.cap.__0</Item> + <Item Name="[capacity]" ExcludeView="simple">buf.inner.cap.__0</Item> <ArrayItems> <Size>len</Size> - <ValuePointer>buf.ptr.pointer.pointer</ValuePointer> + <ValuePointer>($T1*)buf.inner.ptr.pointer.pointer</ValuePointer> </ArrayItems> </Expand> </Type> @@ -15,7 +15,7 @@ <DisplayString>{{ len={len} }}</DisplayString> <Expand> <Item Name="[len]" ExcludeView="simple">len</Item> - <Item Name="[capacity]" ExcludeView="simple">buf.cap.__0</Item> + <Item Name="[capacity]" ExcludeView="simple">buf.inner.cap.__0</Item> <CustomListItems> <Variable Name="i" InitialValue="0" /> <Size>len</Size> @@ -23,7 +23,7 @@ <If Condition="i == len"> <Break/> </If> - <Item>buf.ptr.pointer.pointer[(i + head) % buf.cap.__0]</Item> + <Item>(($T1*)buf.inner.ptr.pointer.pointer)[(i + head) % buf.inner.cap.__0]</Item> <Exec>i = i + 1</Exec> </Loop> </CustomListItems> @@ -41,17 +41,17 @@ </Expand> </Type> <Type Name="alloc::string::String"> - <DisplayString>{(char*)vec.buf.ptr.pointer.pointer,[vec.len]s8}</DisplayString> - <StringView>(char*)vec.buf.ptr.pointer.pointer,[vec.len]s8</StringView> + <DisplayString>{(char*)vec.buf.inner.ptr.pointer.pointer,[vec.len]s8}</DisplayString> + <StringView>(char*)vec.buf.inner.ptr.pointer.pointer,[vec.len]s8</StringView> <Expand> <Item Name="[len]" ExcludeView="simple">vec.len</Item> - <Item Name="[capacity]" ExcludeView="simple">vec.buf.cap.__0</Item> + <Item Name="[capacity]" ExcludeView="simple">vec.buf.inner.cap.__0</Item> <Synthetic Name="[chars]"> - <DisplayString>{(char*)vec.buf.ptr.pointer.pointer,[vec.len]s8}</DisplayString> + <DisplayString>{(char*)vec.buf.inner.ptr.pointer.pointer,[vec.len]s8}</DisplayString> <Expand> <ArrayItems> <Size>vec.len</Size> - <ValuePointer>(char*)vec.buf.ptr.pointer.pointer</ValuePointer> + <ValuePointer>(char*)vec.buf.inner.ptr.pointer.pointer</ValuePointer> </ArrayItems> </Expand> </Synthetic> diff --git a/src/etc/natvis/libstd.natvis b/src/etc/natvis/libstd.natvis index 4371b995318..4719a479c47 100644 --- a/src/etc/natvis/libstd.natvis +++ b/src/etc/natvis/libstd.natvis @@ -104,14 +104,14 @@ </Type> <Type Name="std::ffi::os_str::OsString"> - <DisplayString>{(char*)inner.inner.bytes.buf.ptr.pointer.pointer,[inner.inner.bytes.len]}</DisplayString> + <DisplayString>{(char*)inner.inner.bytes.buf.inner.ptr.pointer.pointer,[inner.inner.bytes.len]}</DisplayString> <Expand> <Synthetic Name="[chars]"> - <DisplayString>{(char*)inner.inner.bytes.buf.ptr.pointer.pointer,[inner.inner.bytes.len]}</DisplayString> + <DisplayString>{(char*)inner.inner.bytes.buf.inner.ptr.pointer.pointer,[inner.inner.bytes.len]}</DisplayString> <Expand> <ArrayItems> <Size>inner.inner.bytes.len</Size> - <ValuePointer>(char*)inner.inner.bytes.buf.ptr.pointer.pointer</ValuePointer> + <ValuePointer>(char*)inner.inner.bytes.buf.inner.ptr.pointer.pointer</ValuePointer> </ArrayItems> </Expand> </Synthetic> |