make version a static

Author: analogrelay

sdk/cosmos/cosmosclient/src/lib.rs

@@ -3,34 +3,17 @@
 
 use std::ffi::{c_char, CStr, CString};
 
+#[macro_use]
+mod macros;
+
 #[no_mangle] // Necessary to prevent the compiler from stripping it when optimizing
 /// cbindgen:ignore
-pub static BUILD_IDENTIFIER: &CStr = 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
-    // and thus appears properly if you run `strings [lib] | grep "\$Id:"`
-    const BUILD_IDENTIFIER_STR: &str = env!("BUILD_IDENTIFIER");
-    const BUILD_IDENTIFIER_BYTES: [u8; BUILD_IDENTIFIER_STR.len() + 1] = const {
-        let mut cstrbuf: [u8; BUILD_IDENTIFIER_STR.len() + 1] = [0; BUILD_IDENTIFIER_STR.len() + 1];
-        let mut i = 0;
-        // For loops over ranges don't really work in const contexts.
-        while i < BUILD_IDENTIFIER_STR.len() {
-            cstrbuf[i] = BUILD_IDENTIFIER_STR.as_bytes()[i];
-            i += 1;
-        }
-        cstrbuf
-    };
-    match CStr::from_bytes_with_nul(&BUILD_IDENTIFIER_BYTES) {
-        Ok(cstr) => cstr,
-        Err(_) => panic!("BUILD_IDENTIFIER is not a valid C string"),
-    }
-};
+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.
 pub extern "C" fn cosmosclient_version() -> *const c_char {
-    let version = env!("CARGO_PKG_VERSION");
-    CString::new(version)
-        .expect("failed to create CString from version")
-        .into_raw()
+    VERSION.as_ptr()
 }

sdk/cosmos/cosmosclient/src/macros.rs

@@ -0,0 +1,21 @@
+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 really work in const contexts.
+            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"),
+        }
+    } },
+}