Fix regex and add tests for Path

Author: n8henrie

src/etc/lldb_commands

@@ -16,6 +16,6 @@ type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)R
 type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefMut<.+>$" --category Rust
 type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefCell<.+>$" --category Rust
 type summary add -F lldb_lookup.summary_lookup  -e -x -h "^core::num::([a-z_]+::)*NonZero.+$" --category Rust
-type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?std::path::Path$" --category Rust
 type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::([a-z_]+::)+)PathBuf$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?(std::([a-z_]+::)+)Path$" --category Rust
 type category enable Rust

src/etc/rust_types.py

@@ -53,8 +53,8 @@ class RustType(object):
 STD_REF_MUT_REGEX = re.compile(r"^(core::(\w+::)+)RefMut<.+>$")
 STD_REF_CELL_REGEX = re.compile(r"^(core::(\w+::)+)RefCell<.+>$")
 STD_NONZERO_NUMBER_REGEX = re.compile(r"^core::num::([a-z_]+::)*NonZero.+$")
-STD_PATH_REGEX =  re.compile(r"^&(mut )?std::path::Path$")
 STD_PATHBUF_REGEX = re.compile(r"^(std::([a-z_]+::)+)PathBuf$")
+STD_PATH_REGEX =  re.compile(r"^&(mut )?(std::([a-z_]+::)+)Path$")
 
 TUPLE_ITEM_REGEX = re.compile(r"__\d+$")
 

src/tools/compiletest/src/runtest.rs

@@ -1494,8 +1494,8 @@ impl<'test> TestCx<'test> {
             "^(core::([a-z_]+::)+)RefMut<.+>$",
             "^(core::([a-z_]+::)+)RefCell<.+>$",
             "^core::num::([a-z_]+::)*NonZero.+$",
-            "^&(mut )?std::path::Path$",
             "^(std::([a-z_]+::)+)PathBuf$",
+            "^&(mut )?(std::([a-z_]+::)+)Path$",
         ];
 
         // In newer versions of lldb, persistent results (the `$N =` part at the start of

tests/debuginfo/path.rs

@@ -6,16 +6,18 @@
 
 // lldb-command:run
 
-// lldb-command:print path
-// lldb-check:[...]$0 = strong=11, weak=1 { value = 111 }
 // lldb-command:print pathbuf
-// lldb-check:[...]$1 = strong=21, weak=1 { data = 222 }
+// lldb-check:[...]$0 = "/some/path" { inner = "/some/path" { inner = { inner = size=10 { [0] = '/' [1] = 's' [2] = 'o' [3] = 'm' [4] = 'e' [5] = '/' [6] = 'p' [7] = 'a' [8] = 't' [9] = 'h' } } } }
+// lldb-command:po pathbuf
+// lldb-check:"/some/path"
+// lldb-command:print path
+// lldb-check:[...]$1 = "/some/path" { data_ptr = [...] length = 10 }
 
 use std::path::Path;
 
 fn main() {
     let path = Path::new("/some/path");
-    let pathbuf = &path.to_path_buf();
+    let pathbuf = path.to_path_buf();
 
     zzz(); // #break
 }