summaryrefslogtreecommitdiff
path: root/src/etc
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-11-14 16:22:14 -0700
committerTom Tromey <tom@tromey.com>2018-11-14 16:22:14 -0700
commita9a48ed3da1134364052322d628fd9d9418998f4 (patch)
tree751f89182a416a44e212a02cbfca3f93170686ce /src/etc
parent9fefb67669f00c25b476e7a80c9c9300a987d517 (diff)
downloadrust-a9a48ed3da1134364052322d628fd9d9418998f4.tar.gz
Fix VecDeque pretty-printer
This fixes the VecDeque pretty-printer to handle cases where head < tail. Closes #55944
Diffstat (limited to 'src/etc')
-rwxr-xr-xsrc/etc/gdb_rust_pretty_printing.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/etc/gdb_rust_pretty_printing.py b/src/etc/gdb_rust_pretty_printing.py
index e6d5ef1a23f..27275ba3795 100755
--- a/src/etc/gdb_rust_pretty_printing.py
+++ b/src/etc/gdb_rust_pretty_printing.py
@@ -293,15 +293,23 @@ class RustStdVecDequePrinter(object):
def to_string(self):
(tail, head, data_ptr, cap) = \
rustpp.extract_tail_head_ptr_and_cap_from_std_vecdeque(self.__val)
+ if head >= tail:
+ size = head - tail
+ else:
+ size = cap + head - tail
return (self.__val.type.get_unqualified_type_name() +
- ("(len: %i, cap: %i)" % (head - tail, cap)))
+ ("(len: %i, cap: %i)" % (size, cap)))
def children(self):
(tail, head, data_ptr, cap) = \
rustpp.extract_tail_head_ptr_and_cap_from_std_vecdeque(self.__val)
gdb_ptr = data_ptr.get_wrapped_value()
- for index in xrange(tail, head):
- yield (str(index), (gdb_ptr + index).dereference())
+ if head >= tail:
+ size = head - tail
+ else:
+ size = cap + head - tail
+ for index in xrange(0, size):
+ yield (str(index), (gdb_ptr + ((tail + index) % cap)).dereference())
class RustStdBTreeSetPrinter(object):