pr feedback

Author: analogrelay

Cargo.toml

@@ -11,6 +11,7 @@ members = [
   "sdk/core/azure_core_test_macros",
   "sdk/core/azure_core_opentelemetry",
   "sdk/cosmos/azure_data_cosmos",
+  "sdk/cosmos/azure_data_cosmos_native",
   "sdk/identity/azure_identity",
   "sdk/eventhubs/azure_messaging_eventhubs",
   "sdk/eventhubs/azure_messaging_eventhubs_checkpointstore_blob",
@@ -22,7 +23,6 @@ members = [
   "sdk/template/azure_template",
   "sdk/storage/azure_storage_common",
   "sdk/storage/azure_storage_blob",
-  "sdk/cosmos/cosmosclient",
 ]
 exclude = [
   "eng/scripts",

sdk/cosmos/cosmosclient/.gitignore renamed to sdk/cosmos/azure_data_cosmos_native/.gitignore

@@ -1,7 +1,7 @@
 [package]
-name = "cosmosclient"
+name = "azure_data_cosmos_native"
 publish = false
-description = "C library wrapping the Azure CosmosDB SDK for Rust"
+description = "The Cosmos Native Client is a C library, written in Rust but exporting a C-compatible API, that provides a full SDK for Azure Cosmos DB."
 version = "0.27.0"
 authors.workspace = true
 edition.workspace = true
@@ -10,6 +10,7 @@ repository.workspace = true
 rust-version.workspace = true
 
 [lib]
+name = "cosmosclient"
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]

sdk/cosmos/cosmosclient/CMakeLists.txt renamed to sdk/cosmos/azure_data_cosmos_native/CMakeLists.txt

@@ -1,19 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-use std::ffi::{c_char, CStr, CString};
+use std::ffi::{c_char, CStr};
 
 #[macro_use]
 mod macros;
 
-#[no_mangle] // Necessary to prevent the compiler from stripping it when optimizing
 /// cbindgen:ignore
+#[no_mangle] // Necessary to prevent the compiler from stripping it when optimizing
 pub static BUILD_IDENTIFIER: &CStr = c_str!(env!("BUILD_IDENTIFIER"));
 
 const VERSION: &CStr = c_str!(env!("CARGO_PKG_VERSION"));
 
-#[no_mangle]
 /// Returns a constant C string containing the version of the Cosmos Client library.
+#[no_mangle]
 pub extern "C" fn cosmosclient_version() -> *const c_char {
     VERSION.as_ptr()
 }

sdk/cosmos/cosmosclient/Cargo.toml renamed to sdk/cosmos/azure_data_cosmos_native/Cargo.toml

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+macro_rules! c_str {
+    ($s:expr) => {
+        const {
+            // This does a few funky things to make sure we can stay in a const context
+            // Which ensures the string is generated as a c-str at compile time
+            const STR: &str = $s;
+            const BYTES: [u8; STR.len() + 1] = const {
+                let mut cstrbuf: [u8; STR.len() + 1] = [0; STR.len() + 1];
+                let mut i = 0;
+                // For loops over ranges don't work in const contexts yet.
+                while i < STR.len() {
+                    cstrbuf[i] = STR.as_bytes()[i];
+                    i += 1;
+                }
+                cstrbuf
+            };
+            match CStr::from_bytes_with_nul(&BYTES) {
+                Ok(cstr) => cstr,
+                Err(_) => panic!("failed to convert value to C string"),
+            }
+        }
+    };
+}