diff options
| author | kennytm <kennytm@gmail.com> | 2017-12-20 21:21:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 21:21:57 +0800 |
| commit | f35bb15fc6fc764af9d97b240b133343b82a7e24 (patch) | |
| tree | 1982773afcf5d9b8e69fe4da0ef3dcef8b3072e2 | |
| parent | cc3f4357d37e87449313c8af355f4331a5289b8d (diff) | |
| parent | 926865ba2e4e9c137383003d76b6541fe29f6431 (diff) | |
Rollup merge of #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.
| -rw-r--r-- | src/bootstrap/dist.rs | 1 | ||||
| -rw-r--r-- | src/etc/rust-windbg.cmd | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index f04ce47c83f..78de9ec62d9 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -504,6 +504,7 @@ impl Step for DebuggerScripts { install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"), 0o755); + cp_debugger_script("natvis/intrinsic.natvis"); cp_debugger_script("natvis/liballoc.natvis"); cp_debugger_script("natvis/libcore.natvis"); } else { diff --git a/src/etc/rust-windbg.cmd b/src/etc/rust-windbg.cmd index b09b37c1db4..8da4efb5803 100644 --- a/src/etc/rust-windbg.cmd +++ b/src/etc/rust-windbg.cmd @@ -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 -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;" %* |