diff options
| author | Markus Reiter <me@reitermark.us> | 2024-03-09 16:38:50 +0100 |
|---|---|---|
| committer | Markus Reiter <me@reitermark.us> | 2024-03-14 17:34:58 +0100 |
| commit | ecee730c45cdc7a582734d6440acba08a1214f82 (patch) | |
| tree | e0f9e2063bfdcfa9e47736c64955c7e3c8032500 /src | |
| parent | 40f8227d6df463a6af592d631efb260d19924474 (diff) | |
| download | rust-ecee730c45cdc7a582734d6440acba08a1214f82.tar.gz rust-ecee730c45cdc7a582734d6440acba08a1214f82.zip | |
Try fixing `debuginfo` test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/lldb_commands | 2 | ||||
| -rw-r--r-- | src/etc/natvis/libcore.natvis | 5 | ||||
| -rw-r--r-- | src/etc/rust_types.py | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/etc/lldb_commands b/src/etc/lldb_commands index ed66ecf3072..5304f2ca34a 100644 --- a/src/etc/lldb_commands +++ b/src/etc/lldb_commands @@ -15,5 +15,5 @@ type summary add -F lldb_lookup.summary_lookup -e -x -h "^(core::([a-z_]+::)+)C type summary add -F lldb_lookup.summary_lookup -e -x -h "^(core::([a-z_]+::)+)Ref<.+>$" --category Rust 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 "^core::num::([a-z_]+::)*NonZero<.+>$" --category Rust type category enable Rust diff --git a/src/etc/natvis/libcore.natvis b/src/etc/natvis/libcore.natvis index 5e0c21a13a9..8a441cf2093 100644 --- a/src/etc/natvis/libcore.natvis +++ b/src/etc/natvis/libcore.natvis @@ -42,7 +42,10 @@ </Type> <Type Name="core::num::nonzero::NonZero<*>"> - <DisplayString>{__0}</DisplayString> + <DisplayString>{__0.__0}</DisplayString> + <Expand> + <ExpandedItem>__0.__0</ExpandedItem> + </Expand> </Type> <Type Name="core::num::wrapping::Wrapping<*>"> diff --git a/src/etc/rust_types.py b/src/etc/rust_types.py index bf512bc99b8..3b2d2f9e983 100644 --- a/src/etc/rust_types.py +++ b/src/etc/rust_types.py @@ -50,7 +50,7 @@ STD_CELL_REGEX = re.compile(r"^(core::(\w+::)+)Cell<.+>$") STD_REF_REGEX = re.compile(r"^(core::(\w+::)+)Ref<.+>$") 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_NONZERO_NUMBER_REGEX = re.compile(r"^core::num::([a-z_]+::)*NonZero<.+>$") TUPLE_ITEM_REGEX = re.compile(r"__\d+$") diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index ae0db88d873..1e1c5fb20d4 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1495,7 +1495,7 @@ impl<'test> TestCx<'test> { "^(core::([a-z_]+::)+)Ref<.+>$", "^(core::([a-z_]+::)+)RefMut<.+>$", "^(core::([a-z_]+::)+)RefCell<.+>$", - "^core::num::([a-z_]+::)*NonZero.+$", + "^core::num::([a-z_]+::)*NonZero<.+>$", ]; // In newer versions of lldb, persistent results (the `$N =` part at the start of |