Declare extern std if RustAdvancedLoggerDxe is build with std enabled

microsoft · Dec 1, 2023 · 1c35bf1 · 1c35bf1
1 parent 17b254f
commit 1c35bf1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/AdvLoggerPkg/Crates/RustAdvancedLoggerDxe/src/lib.rs b/AdvLoggerPkg/Crates/RustAdvancedLoggerDxe/src/lib.rs
@@ -29,7 +29,7 @@
 //!
 #![no_std]
 
-#[cfg(doc)]
+#[cfg(any(doc, feature = "std"))]
 extern crate std; //allow rustdoc links to reference std (e.g. println docs below).
 
 use core::{
@@ -173,8 +173,6 @@ mod no_std_debug {
 
 #[cfg(feature = "std")]
 mod std_debug {
-  extern crate std;
-
   /// Prints to the console log.
   ///
   /// This macro uses the same syntax as rust std [`std::println!`] macro, with the addition of a level argument that
@@ -203,7 +201,7 @@ mod std_debug {
   macro_rules! debug {
       ($level:expr, $($arg:tt)*) => {
           let _ = $level;
-          print!($($arg)*)
+          std::print!($($arg)*)
       }
   }
 }

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,11 +3,11 @@ resolver = "2"
 
 # Add packages that generate binaries here
 members = [
-  "HidPkg/Crates/HidIo",
-  "HidPkg/Crates/HiiKeyboardLayout",
-  "HidPkg/UefiHidDxe",
+#  "HidPkg/Crates/HidIo",
+#  "HidPkg/Crates/HiiKeyboardLayout",
+#  "HidPkg/UefiHidDxe",
   "HidPkg/UefiHidDxeV2",
-  "MsCorePkg/HelloWorldRustDxe"
+#  "MsCorePkg/HelloWorldRustDxe"
 ]
 
 # Add packages that generate libraries here