Skip to content

Commit 1e77350

Browse files
committed
Add rust-lldb pretty printing for Path and PathBuf
Fixes rust-lang#120553 Fixes rust-lang#48462
1 parent 11f32b7 commit 1e77350

File tree

4 files changed

+42
-0
lines changed

4 files changed

+42
-0
lines changed

Diff for: src/etc/lldb_commands

+2
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ type summary add -F lldb_lookup.summary_lookup -e -x -h "^(core::([a-z_]+::)+)R
1616
type summary add -F lldb_lookup.summary_lookup -e -x -h "^(core::([a-z_]+::)+)RefMut<.+>$" --category Rust
1717
type summary add -F lldb_lookup.summary_lookup -e -x -h "^(core::([a-z_]+::)+)RefCell<.+>$" --category Rust
1818
type summary add -F lldb_lookup.summary_lookup -e -x -h "^core::num::([a-z_]+::)*NonZero.+$" --category Rust
19+
type summary add -F lldb_lookup.summary_lookup -e -x -h "^std::path::PathBuf$" --category Rust
20+
type summary add -F lldb_lookup.summary_lookup -e -x -h "^&(mut )?std::path::Path$" --category Rust
1921
type category enable Rust

Diff for: src/etc/lldb_lookup.py

+5
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ def summary_lookup(valobj, dict):
5858
if rust_type == RustType.STD_NONZERO_NUMBER:
5959
return StdNonZeroNumberSummaryProvider(valobj, dict)
6060

61+
if rust_type == RustType.STD_PATHBUF:
62+
return StdPathBufSummaryProvider(valobj, dict)
63+
if rust_type == RustType.STD_PATH:
64+
return StdPathSummaryProvider(valobj, dict)
65+
6166
return ""
6267

6368

Diff for: src/etc/lldb_providers.py

+29
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,35 @@ def StdStrSummaryProvider(valobj, dict):
173173
return '"%s"' % data
174174

175175

176+
def StdPathBufSummaryProvider(valobj, dict):
177+
# type: (SBValue, dict) -> str
178+
# logger = Logger.Logger()
179+
# logger >> "[StdPathBufSummaryProvider] for " + str(valobj.GetName())
180+
return StdOsStringSummaryProvider(valobj.GetChildMemberWithName("inner"), dict)
181+
182+
183+
def StdPathSummaryProvider(valobj, dict):
184+
# type: (SBValue, dict) -> str
185+
# logger = Logger.Logger()
186+
# logger >> "[StdPathSummaryProvider] for " + str(valobj.GetName())
187+
length = valobj.GetChildMemberWithName("length").GetValueAsUnsigned()
188+
if length == 0:
189+
return '""'
190+
191+
data_ptr = valobj.GetChildMemberWithName("data_ptr")
192+
193+
start = data_ptr.GetValueAsUnsigned()
194+
error = SBError()
195+
process = data_ptr.GetProcess()
196+
data = process.ReadMemory(start, length, error)
197+
if PY3:
198+
try:
199+
data = data.decode(encoding='UTF-8')
200+
except UnicodeDecodeError:
201+
return '%r' % data
202+
return '"%s"' % data
203+
204+
176205
class StructSyntheticProvider:
177206
"""Pretty-printer for structs and struct enum variants"""
178207

Diff for: src/etc/rust_types.py

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class RustType(object):
3232
STD_REF_MUT = "StdRefMut"
3333
STD_REF_CELL = "StdRefCell"
3434
STD_NONZERO_NUMBER = "StdNonZeroNumber"
35+
STD_PATH = "StdPath"
36+
STD_PATHBUF = "StdPathBuf"
3537

3638

3739
STD_STRING_REGEX = re.compile(r"^(alloc::(\w+::)+)String$")
@@ -51,6 +53,8 @@ class RustType(object):
5153
STD_REF_MUT_REGEX = re.compile(r"^(core::(\w+::)+)RefMut<.+>$")
5254
STD_REF_CELL_REGEX = re.compile(r"^(core::(\w+::)+)RefCell<.+>$")
5355
STD_NONZERO_NUMBER_REGEX = re.compile(r"^core::num::([a-z_]+::)*NonZero.+$")
56+
STD_PATHBUF_REGEX = re.compile(r"^std::path::PathBuf$")
57+
STD_PATH_REGEX = re.compile(r"^&(mut )?std::path::Path$")
5458

5559
TUPLE_ITEM_REGEX = re.compile(r"__\d+$")
5660

@@ -75,6 +79,8 @@ class RustType(object):
7579
RustType.STD_REF_CELL: STD_REF_CELL_REGEX,
7680
RustType.STD_CELL: STD_CELL_REGEX,
7781
RustType.STD_NONZERO_NUMBER: STD_NONZERO_NUMBER_REGEX,
82+
RustType.STD_PATHBUF: STD_PATHBUF_REGEX,
83+
RustType.STD_PATH: STD_PATH_REGEX,
7884
}
7985

8086
def is_tuple_fields(fields):

0 commit comments

Comments
 (0)