From 83a451c649bdd606f80c8cd9325102ce9390681c Mon Sep 17 00:00:00 2001
From: Kenny Kerr <kenny@kennykerr.ca>
Date: Wed, 10 May 2023 16:44:50 -0500
Subject: [PATCH] Stabilize `raw_dylib` and `debugger_visualizer` (#2497)

---
 crates/libs/core/src/lib.rs             | 3 +--
 crates/libs/core/src/strings/hstring.rs | 2 +-
 crates/libs/sys/src/lib.rs              | 1 -
 crates/libs/windows/src/lib.rs          | 1 -
 crates/tests/core/tests/hstring.rs      | 2 --
 crates/tests/lib/tests/sys.rs           | 2 --
 crates/tests/standalone/src/lib.rs      | 1 -
 crates/tests/targets/tests/link.rs      | 1 -
 8 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/crates/libs/core/src/lib.rs b/crates/libs/core/src/lib.rs
index 22c7f64b88..ea5c36d0c2 100644
--- a/crates/libs/core/src/lib.rs
+++ b/crates/libs/core/src/lib.rs
@@ -4,8 +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, feature(debugger_visualizer), debugger_visualizer(natvis_file = "../windows.natvis"))]
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
+#![cfg_attr(windows_debugger_visualizer, debugger_visualizer(natvis_file = "../windows.natvis"))]
 
 extern crate self as windows_core;
 
diff --git a/crates/libs/core/src/strings/hstring.rs b/crates/libs/core/src/strings/hstring.rs
index 72bbba8c1e..93c989bc72 100644
--- a/crates/libs/core/src/strings/hstring.rs
+++ b/crates/libs/core/src/strings/hstring.rs
@@ -66,7 +66,7 @@ impl HSTRING {
             return Ok(Self::new());
         }
 
-        let mut ptr = Header::alloc(len)?;
+        let ptr = Header::alloc(len)?;
 
         // Place each utf-16 character into the buffer and
         // increase len as we go along.
diff --git a/crates/libs/sys/src/lib.rs b/crates/libs/sys/src/lib.rs
index 2e4069f455..238840ed51 100644
--- a/crates/libs/sys/src/lib.rs
+++ b/crates/libs/sys/src/lib.rs
@@ -5,7 +5,6 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs
 #![no_std]
 #![doc(html_no_source)]
 #![allow(non_snake_case, clashing_extern_declarations)]
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
 
 extern crate self as windows_sys;
 mod Windows;
diff --git a/crates/libs/windows/src/lib.rs b/crates/libs/windows/src/lib.rs
index 4c17ea72a8..71df7b34b1 100644
--- a/crates/libs/windows/src/lib.rs
+++ b/crates/libs/windows/src/lib.rs
@@ -6,7 +6,6 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs
 
 #![doc(html_no_source)]
 #![allow(non_snake_case, clashing_extern_declarations)]
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
 
 extern crate self as windows;
 pub use Windows::*;
diff --git a/crates/tests/core/tests/hstring.rs b/crates/tests/core/tests/hstring.rs
index 1f495da9bc..205693dca4 100644
--- a/crates/tests/core/tests/hstring.rs
+++ b/crates/tests/core/tests/hstring.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
-
 use std::convert::TryFrom;
 use windows::core::*;
 
diff --git a/crates/tests/lib/tests/sys.rs b/crates/tests/lib/tests/sys.rs
index 9f198e8ada..4a7c308b9e 100644
--- a/crates/tests/lib/tests/sys.rs
+++ b/crates/tests/lib/tests/sys.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
-
 use windows_sys::{
     Win32::Foundation::*, Win32::Graphics::Gdi::*, Win32::System::ProcessStatus::*,
     Win32::System::Threading::*, Win32::Web::InternetExplorer::*,
diff --git a/crates/tests/standalone/src/lib.rs b/crates/tests/standalone/src/lib.rs
index f04c16f064..46063d771a 100644
--- a/crates/tests/standalone/src/lib.rs
+++ b/crates/tests/standalone/src/lib.rs
@@ -1,5 +1,4 @@
 #![cfg(test)]
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
 #![allow(clashing_extern_declarations)]
 
 mod b_arch;
diff --git a/crates/tests/targets/tests/link.rs b/crates/tests/targets/tests/link.rs
index 17b972d9ad..f306992a66 100644
--- a/crates/tests/targets/tests/link.rs
+++ b/crates/tests/targets/tests/link.rs
@@ -1,5 +1,4 @@
 #![cfg(test)]
-#![cfg_attr(windows_raw_dylib, feature(raw_dylib))]
 
 #[test]
 fn min() {