Skip to content

Natvis cleanup following the windows-result crate split #2853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 7 commits into from
Feb 17, 2024
Merged

Natvis cleanup following the windows-result crate split #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4cd2558
mv
tim-weis Feb 16, 2024
6399bc4
done
tim-weis Feb 16, 2024
94a553b
mv
tim-weis Feb 16, 2024
16a6eb4
done
tim-weis Feb 16, 2024
a9a166c
Merge branches 'split-core' and 'split-result' into natvis
tim-weis Feb 16, 2024
6f55dd2
xml-ified
tim-weis Feb 16, 2024
7e4e880
associate
tim-weis Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions crates/libs/core/windows.natvis → crates/libs/core/natvis/windows-core.natvis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<Type Name="windows_core::array::Array&lt;*&gt;">
<DisplayString>{{ len={len} }}</DisplayString>
Expand All @@ -11,17 +12,6 @@
</Expand>
</Type>

<Type Name="windows_result::error::Error">
<Expand>
<ExpandedItem>code</ExpandedItem>
<Item Name="[info]">info</Item>
</Expand>
</Type>

<Type Name="windows_result::hresult::HRESULT">
<DisplayString>{(HRESULT)__0}</DisplayString>
</Type>

<Type Name="windows_core::imp::ref_count::RefCount">
<DisplayString>{__0}</DisplayString>
</Type>
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs

#![doc(html_no_source)]
#![allow(non_snake_case)]
#![cfg_attr(windows_debugger_visualizer, debugger_visualizer(natvis_file = "../windows.natvis"))]
#![cfg_attr(windows_debugger_visualizer, debugger_visualizer(natvis_file = "../natvis/windows-core.natvis"))]

extern crate self as windows_core;

Expand Down
13 changes: 13 additions & 0 deletions crates/libs/result/natvis/windows-result.natvis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<Type Name="windows_result::error::Error">
<Expand>
<ExpandedItem>code</ExpandedItem>
<Item Name="[info]">info</Item>
</Expand>
</Type>

<Type Name="windows_result::hresult::HRESULT">
<DisplayString>{(HRESULT)__0}</DisplayString>
</Type>
Comment thread
riverar marked this conversation as resolved.
</AutoVisualizer>
5 changes: 5 additions & 0 deletions crates/libs/result/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs>
*/

#![cfg_attr(
windows_debugger_visualizer,
debugger_visualizer(natvis_file = "../natvis/windows-result.natvis")
)]

mod bindings;
use bindings::*;

Expand Down