Remove Xaml interop namespace (#2008)

microsoft · Sep 6, 2022 · 78a7cc1 · 78a7cc1
1 parent 4097440
commit 78a7cc1
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 1,848 deletions.
diff --git a/crates/libs/sys/Cargo.toml b/crates/libs/sys/Cargo.toml
@@ -341,7 +341,6 @@ Win32_System_WinRT_Pdf = ["Win32_System_WinRT"]
 Win32_System_WinRT_Printing = ["Win32_System_WinRT"]
 Win32_System_WinRT_Shell = ["Win32_System_WinRT"]
 Win32_System_WinRT_Storage = ["Win32_System_WinRT"]
-Win32_System_WinRT_Xaml = ["Win32_System_WinRT"]
 Win32_System_WindowsProgramming = ["Win32_System"]
 Win32_System_WindowsSync = ["Win32_System"]
 Win32_System_Wmi = ["Win32_System"]

diff --git a/crates/libs/sys/src/Windows/Win32/System/WinRT/Xaml/mod.rs b/crates/libs/sys/src/Windows/Win32/System/WinRT/Xaml/mod.rs
diff --git a/crates/libs/sys/src/Windows/Win32/System/WinRT/mod.rs b/crates/libs/sys/src/Windows/Win32/System/WinRT/mod.rs
@@ -26,8 +26,6 @@ pub mod Printing;
 pub mod Shell;
 #[cfg(feature = "Win32_System_WinRT_Storage")]
 pub mod Storage;
-#[cfg(feature = "Win32_System_WinRT_Xaml")]
-pub mod Xaml;
 #[cfg_attr(windows, link(name = "windows"))]
 extern "cdecl" {
     #[doc = "*Required features: `\"Win32_System_WinRT\"`*"]

diff --git a/crates/libs/windows/Cargo.toml b/crates/libs/windows/Cargo.toml
@@ -691,7 +691,6 @@ Win32_System_WinRT_Pdf = ["Win32_System_WinRT"]
 Win32_System_WinRT_Printing = ["Win32_System_WinRT"]
 Win32_System_WinRT_Shell = ["Win32_System_WinRT"]
 Win32_System_WinRT_Storage = ["Win32_System_WinRT"]
-Win32_System_WinRT_Xaml = ["Win32_System_WinRT"]
 Win32_System_WindowsProgramming = ["Win32_System"]
 Win32_System_WindowsSync = ["Win32_System"]
 Win32_System_Wmi = ["Win32_System"]

diff --git a/crates/libs/windows/src/Windows/Win32/System/WinRT/Xaml/impl.rs b/crates/libs/windows/src/Windows/Win32/System/WinRT/Xaml/impl.rs
diff --git a/crates/libs/windows/src/Windows/Win32/System/WinRT/Xaml/mod.rs b/crates/libs/windows/src/Windows/Win32/System/WinRT/Xaml/mod.rs
diff --git a/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs b/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs
@@ -26,8 +26,6 @@ pub mod Printing;
 pub mod Shell;
 #[cfg(feature = "Win32_System_WinRT_Storage")]
 pub mod Storage;
-#[cfg(feature = "Win32_System_WinRT_Xaml")]
-pub mod Xaml;
 #[doc = "*Required features: `\"Win32_System_WinRT\"`*"]
 #[inline]
 pub unsafe fn CreateControlInput<T>() -> ::windows::core::Result<T>

diff --git a/crates/tools/lib/src/lib.rs b/crates/tools/lib/src/lib.rs
@@ -2,7 +2,7 @@ use std::collections::*;
 use std::io::*;
 
 /// Namespaces to exclude from code generation for the `windows` and `windows-sys` crates.
-pub const EXCLUDE_NAMESPACES: [&str; 4] = ["Windows.UI.Xaml", "Windows.Win32.Interop", "Windows.Win32.System.Diagnostics.Debug.WebApp", "Windows.Win32.Web"];
+pub const EXCLUDE_NAMESPACES: [&str; 5] = ["Windows.UI.Xaml", "Windows.Win32.System.WinRT.Xaml", "Windows.Win32.Interop", "Windows.Win32.System.Diagnostics.Debug.WebApp", "Windows.Win32.Web"];
 
 /// Formats the token string
 pub fn format(namespace: &str, tokens: &mut String, use_rustfmt: bool) {