diff options
| author | MaulingMonkey <git@maulingmonkey.com> | 2019-05-09 16:15:43 -0700 |
|---|---|---|
| committer | MaulingMonkey <git@maulingmonkey.com> | 2019-05-09 16:15:43 -0700 |
| commit | 7c55b48d3121178ca05e04812e4c708f7fa6dff5 (patch) | |
| tree | f83476c983febd61cca1f2913d0973b1bfbaa18f | |
| parent | a784a80228c9eac3aa0fd86fc90887d5fa20c82e (diff) | |
| download | rust-7c55b48d3121178ca05e04812e4c708f7fa6dff5.tar.gz rust-7c55b48d3121178ca05e04812e4c708f7fa6dff5.zip | |
Fix .natvis visualizers.
Updated to handle these changes: - `core::ptr::*` lost their `__0` elements and are just plain pointers - `core::ptr::*` probably shouldn't dereference in `DisplayString` s - `VecDeque` and `Vec` use `core::ptr::*` s - `VecDeque` and `LinkedList` moved modules again. Retested - still working fine, left alone: - `String`, `&str`, `Option`
| -rw-r--r-- | src/etc/natvis/liballoc.natvis | 12 | ||||
| -rw-r--r-- | src/etc/natvis/libcore.natvis | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/etc/natvis/liballoc.natvis b/src/etc/natvis/liballoc.natvis index e3d99e34b35..de30b58526a 100644 --- a/src/etc/natvis/liballoc.natvis +++ b/src/etc/natvis/liballoc.natvis @@ -7,11 +7,11 @@ <Item Name="[capacity]" ExcludeView="simple">buf.cap</Item> <ArrayItems> <Size>len</Size> - <ValuePointer>buf.ptr.pointer.__0</ValuePointer> + <ValuePointer>buf.ptr.pointer</ValuePointer> </ArrayItems> </Expand> </Type> - <Type Name="alloc::vec_deque::VecDeque<*>"> + <Type Name="alloc::collections::vec_deque::VecDeque<*>"> <DisplayString>{{ size={tail <= head ? head - tail : buf.cap - tail + head} }}</DisplayString> <Expand> <Item Name="[size]" ExcludeView="simple">tail <= head ? head - tail : buf.cap - tail + head</Item> @@ -24,19 +24,19 @@ <If Condition="i == head"> <Break/> </If> - <Item>buf.ptr.pointer.__0 + i</Item> + <Item>buf.ptr.pointer[i]</Item> <Exec>i = (i + 1 == buf.cap ? 0 : i + 1)</Exec> </Loop> </CustomListItems> </Expand> </Type> - <Type Name="alloc::linked_list::LinkedList<*>"> + <Type Name="alloc::collections::linked_list::LinkedList<*>"> <DisplayString>{{ size={len} }}</DisplayString> <Expand> <LinkedListItems> <Size>len</Size> - <HeadPointer>*(alloc::linked_list::Node<$T1> **)&head</HeadPointer> - <NextPointer>*(alloc::linked_list::Node<$T1> **)&next</NextPointer> + <HeadPointer>*(alloc::collections::linked_list::Node<$T1> **)&head</HeadPointer> + <NextPointer>*(alloc::collections::linked_list::Node<$T1> **)&next</NextPointer> <ValueNode>element</ValueNode> </LinkedListItems> </Expand> diff --git a/src/etc/natvis/libcore.natvis b/src/etc/natvis/libcore.natvis index 37d64be1ce9..0e703b3b950 100644 --- a/src/etc/natvis/libcore.natvis +++ b/src/etc/natvis/libcore.natvis @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010"> <Type Name="core::ptr::Unique<*>"> - <DisplayString>{{ Unique {*pointer.__0} }}</DisplayString> + <DisplayString>{{ Unique {pointer} }}</DisplayString> <Expand> - <Item Name="[ptr]">pointer.__0</Item> + <Item Name="[ptr]">pointer</Item> </Expand> </Type> <Type Name="core::ptr::Shared<*>"> - <DisplayString>{{ Shared {*pointer.__0} }}</DisplayString> + <DisplayString>{{ Shared {pointer} }}</DisplayString> <Expand> - <Item Name="[ptr]">pointer.__0</Item> + <Item Name="[ptr]">pointer</Item> </Expand> </Type> <Type Name="core::option::Option<*>"> |