reorganize com crate for bindgen upgrade

Azure · Jan 7, 2025 · 092145f · 092145f
1 parent d9e9492
commit 092145f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/...ibs/com/src/ServiceFabric/FabricClient.rs → ...crosoft/ServiceFabric/FabricClient/mod.rs b/...ibs/com/src/ServiceFabric/FabricClient.rs → ...crosoft/ServiceFabric/FabricClient/mod.rs
diff --git a/...ibs/com/src/ServiceFabric/FabricCommon.rs → ...crosoft/ServiceFabric/FabricCommon/mod.rs b/...ibs/com/src/ServiceFabric/FabricCommon.rs → ...crosoft/ServiceFabric/FabricCommon/mod.rs
diff --git a/...bs/com/src/ServiceFabric/FabricRuntime.rs → ...rosoft/ServiceFabric/FabricRuntime/mod.rs b/...bs/com/src/ServiceFabric/FabricRuntime.rs → ...rosoft/ServiceFabric/FabricRuntime/mod.rs
diff --git a/...libs/com/src/ServiceFabric/FabricTypes.rs → ...icrosoft/ServiceFabric/FabricTypes/mod.rs b/...libs/com/src/ServiceFabric/FabricTypes.rs → ...icrosoft/ServiceFabric/FabricTypes/mod.rs
diff --git a/crates/libs/com/src/ServiceFabric/mod.rs → ...bs/com/src/Microsoft/ServiceFabric/mod.rs b/crates/libs/com/src/ServiceFabric/mod.rs → ...bs/com/src/Microsoft/ServiceFabric/mod.rs
diff --git a/crates/libs/com/src/Microsoft/mod.rs b/crates/libs/com/src/Microsoft/mod.rs
@@ -0,0 +1 @@
+pub mod ServiceFabric;
diff --git a/crates/libs/com/src/lib.rs b/crates/libs/com/src/lib.rs
@@ -6,10 +6,10 @@
 #![doc(html_no_source)]
 // extern crate windows;
 #![allow(non_snake_case)]
-pub mod ServiceFabric;
+pub mod Microsoft;
 
 // expose mod directly
-pub use ServiceFabric::*;
+pub use Microsoft::ServiceFabric::*;
 
 // Special usage for mssf_pal.
 // See mssf_pal documentations for why this is used this way.

diff --git a/crates/libs/core/src/error/errorcode.rs b/crates/libs/core/src/error/errorcode.rs
@@ -57,7 +57,7 @@ macro_rules! define_fabric_error_code{
 
             // defines SF error codes.
             $(
-                $code = mssf_com::ServiceFabric::FabricTypes::$code .0,
+                $code = mssf_com::FabricTypes::$code .0,
             )*
         }
 
@@ -71,7 +71,7 @@ macro_rules! define_fabric_error_code{
                     )*
                     // SF code converts.
                     $(
-                        mssf_com::ServiceFabric::FabricTypes::$code => Ok(Self::$code),
+                        mssf_com::FabricTypes::$code => Ok(Self::$code),
                     )*
                     _ => Err("Unknown FABRIC_ERROR_CODE")
                 }

diff --git a/crates/tools/api/src/main.rs b/crates/tools/api/src/main.rs
@@ -12,10 +12,10 @@ use windows_bindgen::{bindgen, Result};
 fn main() -> Result<()> {
     let winmd = "./build/_deps/fabric_metadata-src/.windows/winmd/Microsoft.ServiceFabric.winmd";
     // create output dir if not exist
-    fs::create_dir_all("crates/libs/com/src/ServiceFabric/").unwrap();
+    fs::create_dir_all("crates/libs/com/src/Microsoft/ServiceFabric/").unwrap();
     // Generate FabricTypes
     {
-        let out_file = "crates/libs/com/src/ServiceFabric/FabricTypes.rs";
+        let out_file = "crates/libs/com/src/Microsoft/ServiceFabric/FabricTypes/mod.rs";
         let log = bindgen([
             "--in",
             winmd,
@@ -35,7 +35,7 @@ fn main() -> Result<()> {
     }
     // Generate FabricCommon
     {
-        let out_file = "crates/libs/com/src/ServiceFabric/FabricCommon.rs";
+        let out_file = "crates/libs/com/src/Microsoft/ServiceFabric/FabricCommon/mod.rs";
         let log = bindgen([
             "--in",
             winmd,
@@ -62,7 +62,7 @@ fn main() -> Result<()> {
     }
     // Generate FabricRuntime
     {
-        let out_file = "crates/libs/com/src/ServiceFabric/FabricRuntime.rs";
+        let out_file = "crates/libs/com/src/Microsoft/ServiceFabric/FabricRuntime/mod.rs";
         let log = bindgen([
             "--in",
             winmd,
@@ -103,7 +103,7 @@ fn main() -> Result<()> {
 
     // Generate FabricClient
     {
-        let out_file = "crates/libs/com/src/ServiceFabric/FabricClient.rs";
+        let out_file = "crates/libs/com/src/Microsoft/ServiceFabric/FabricClient/mod.rs";
         let log = bindgen([
             "--in",
             winmd,