bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #46794 - Sh4rK:distribute-intrinsic-natvis, r=estebank

Browse source 
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.
This commit is contained in:
kennytm 2017-12-20 21:21:57 +08:00 • committed by GitHub
commit f35bb15fc6
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/bootstrap/dist.rs
View file

@ -504,6 +504,7 @@ impl Step for DebuggerScripts {
install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"), install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"),
0o755); 0o755);
cp_debugger_script("natvis/intrinsic.natvis");
cp_debugger_script("natvis/liballoc.natvis"); cp_debugger_script("natvis/liballoc.natvis");
cp_debugger_script("natvis/libcore.natvis"); cp_debugger_script("natvis/libcore.natvis");
} else { } else {

2
src/etc/rust-windbg.cmd
View file

@ -15,4 +15,4 @@ for /f "delims=" %%i in ('rustc --print=sysroot') do set rustc_sysroot=%%i
set rust_etc=%rustc_sysroot%\lib\rustlib\etc set rust_etc=%rustc_sysroot%\lib\rustlib\etc
windbg -c ".nvload %rust_etc%\liballoc.natvis; .nvload %rust_etc%\libcore.natvis;" %* windbg -c ".nvload %rust_etc%\intrinsic.natvis; .nvload %rust_etc%\liballoc.natvis; .nvload %rust_etc%\libcore.natvis;" %*