From c41c20a943a4c6b2f4b8b344dc686ee0ff27df46 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 6 Jan 2019 14:40:01 -0700
Subject: [PATCH] Allow for static CStr
---
src/c_str.rs | 2 +-
src/lib.rs | 2 ++
src/macros.rs | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/c_str.rs b/src/c_str.rs
index 606e883be..b6158b934 100644
--- a/src/c_str.rs
+++ b/src/c_str.rs
@@ -995,7 +995,7 @@ impl CStr {
/// }
/// ```
#[inline]
- pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
+ pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
&*(bytes as *const [u8] as *const CStr)
}
diff --git a/src/lib.rs b/src/lib.rs
index 0038f74a2..9116f0d5d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,6 +5,8 @@
#![feature(alloc)]
#![feature(allocator_api)]
#![feature(const_fn)]
+#![feature(const_raw_ptr_deref)]
+#![feature(const_str_as_bytes)]
#![feature(const_vec_new)]
#![feature(core_intrinsics)]
#![feature(global_asm)]
diff --git a/src/macros.rs b/src/macros.rs
index a564a5ed9..ec0ddf497 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -3,8 +3,8 @@ macro_rules! c_str {
($lit:expr) => {
#[allow(unused_unsafe)]
unsafe {
- $crate::c_str::CStr::from_ptr(
- concat!($lit, "\0").as_ptr() as *const $crate::platform::types::c_char
+ $crate::c_str::CStr::from_bytes_with_nul_unchecked(
+ concat!($lit, "\0").as_bytes()
)
}
};
--
GitLab