Natvis cleanup following the windows-result crate split (#2853)

microsoft · Feb 17, 2024 · a9b594b · a9b594b
1 parent b62b802
commit a9b594b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/crates/libs/core/windows.natvis → crates/libs/core/natvis/windows-core.natvis b/crates/libs/core/windows.natvis → crates/libs/core/natvis/windows-core.natvis
@@ -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>
@@ -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>

diff --git a/crates/libs/core/src/lib.rs b/crates/libs/core/src/lib.rs
@@ -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;
 

diff --git a/crates/libs/result/natvis/windows-result.natvis b/crates/libs/result/natvis/windows-result.natvis
@@ -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>
+</AutoVisualizer>
diff --git a/crates/libs/result/src/lib.rs b/crates/libs/result/src/lib.rs
@@ -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::*;