diff --git a/.travis.yml b/.travis.yml index cc93b1127c3a7..b85737dc97d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - echo 'deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list - echo 'deb-src http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list - sudo apt-get update - - sudo apt-get --force-yes install curl make g++ python2.7 git zlib1g-dev libedit-dev llvm-3.7-tools + - sudo apt-get --force-yes install curl make g++ python2.7 git zlib1g-dev libedit-dev llvm-3.7-tools gdb lldb-3.7 script: - ./configure --llvm-root=/usr/lib/llvm-3.7 diff --git a/src/etc/debugger_pretty_printers_common.py b/src/etc/debugger_pretty_printers_common.py index 06a83c75936fe..b2bb7859661ab 100644 --- a/src/etc/debugger_pretty_printers_common.py +++ b/src/etc/debugger_pretty_printers_common.py @@ -139,7 +139,7 @@ def __classify_struct(self): return TYPE_KIND_STR_SLICE # REGULAR SLICE - if (unqualified_type_name.startswith("&[") and + if (unqualified_type_name.startswith(("&[", "&mut [")) and unqualified_type_name.endswith("]") and self.__conforms_to_field_layout(SLICE_FIELD_NAMES)): return TYPE_KIND_SLICE diff --git a/src/test/debuginfo/vec-slices.rs b/src/test/debuginfo/vec-slices.rs index 0d396c885eb85..4b61ef804bbee 100644 --- a/src/test/debuginfo/vec-slices.rs +++ b/src/test/debuginfo/vec-slices.rs @@ -76,6 +76,9 @@ // lldb-command:print padded_struct // lldb-check:[...]$5 = &[AStruct { x: 10, y: 11, z: 12 }, AStruct { x: 13, y: 14, z: 15 }] +// lldb-command:print 'vec_slices::MUT_VECT_SLICE' +// lldb-check:[...]$6 = &mut [64, 65] + #![allow(dead_code, unused_variables)] #![feature(omit_gdb_pretty_printer_section)] #![omit_gdb_pretty_printer_section]