Skip to content

Commit f35bb15

Browse files
authored
Rollup merge of rust-lang#46794 - Sh4rK:distribute-intrinsic-natvis, r=estebank
Distribute intrinsic.natvis with the compiler for windows-msvc. This adds `intrinsic.natvis` to the `windows-msvc` distributions of Rust, enabling the visualization of `str` and slices in the VS debugger. Two other natvis files are already included, this was probably just an oversight. I also updated `rust-windbg.cmd` to load this file as well.
2 parents cc3f435 + 926865b commit f35bb15

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: src/bootstrap/dist.rs

+1
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ impl Step for DebuggerScripts {
504504
install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"),
505505
0o755);
506506

507+
cp_debugger_script("natvis/intrinsic.natvis");
507508
cp_debugger_script("natvis/liballoc.natvis");
508509
cp_debugger_script("natvis/libcore.natvis");
509510
} else {

Diff for: src/etc/rust-windbg.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ for /f "delims=" %%i in ('rustc --print=sysroot') do set rustc_sysroot=%%i
1515

1616
set rust_etc=%rustc_sysroot%\lib\rustlib\etc
1717

18-
windbg -c ".nvload %rust_etc%\liballoc.natvis; .nvload %rust_etc%\libcore.natvis;" %*
18+
windbg -c ".nvload %rust_etc%\intrinsic.natvis; .nvload %rust_etc%\liballoc.natvis; .nvload %rust_etc%\libcore.natvis;" %*

0 commit comments

Comments
 (0)