Export cstr! at correct path.

Author: reitermarkus

Diff for: library/core/src/ffi/c_str.rs

@@ -184,7 +184,7 @@ impl fmt::Debug for CStr {
 /// ```
 /// #![feature(cstr_macro)]
 ///
-/// use core::ffi::CStr;
+/// use core::ffi::{cstr, CStr};
 ///
 /// const HELLO: &CStr = cstr!("Hello, world!");
 /// assert_eq!(HELLO.to_bytes_with_nul(), b"Hello, world!\0");
@@ -196,16 +196,17 @@ impl fmt::Debug for CStr {
 /// ```compile_fail
 /// #![feature(const_cstr_from_bytes)]
 ///
-/// use core::ffi::CStr;
+/// use core::ffi::{cstr, CStr};
 ///
 /// const HELLO: &CStr = cstr!("Hello, world!\0"); // compile fail!
 /// ```
-#[macro_export]
+#[macro_export(local_inner_macros)]
 #[unstable(feature = "cstr_macro", issue = "101607")]
 #[rustc_diagnostic_item = "core_cstr_macro"]
-macro_rules! cstr {
+#[doc(hidden)]
+macro_rules! __cstr_macro_impl {
     () => {
-        cstr!("")
+        __cstr_macro_impl!("")
     };
     ($s:literal) => {{
         const BYTES: &[u8] = $crate::ffi::__cstr_macro_impl_as_bytes($s);
@@ -216,6 +217,9 @@ macro_rules! cstr {
         CSTR
     }};
 }
+#[unstable(feature = "cstr_macro", issue = "101607")]
+#[doc(inline)]
+pub use __cstr_macro_impl as cstr;
 
 #[unstable(feature = "cstr_macro", issue = "101607")]
 #[doc(hidden)]

Diff for: library/core/src/ffi/mod.rs

@@ -23,7 +23,7 @@ mod c_str;
 #[doc(hidden)]
 pub use self::c_str::{
     __cstr_macro_impl_as_bytes, __cstr_macro_impl_from_bytes_with_nul,
-    __cstr_macro_impl_to_bytes_with_nul,
+    __cstr_macro_impl_to_bytes_with_nul, cstr,
 };
 
 macro_rules! type_alias_no_nz {

Diff for: library/std/src/ffi/mod.rs

@@ -160,6 +160,9 @@ pub use core::ffi::{
     c_ulong, c_ulonglong, c_ushort,
 };
 
+#[unstable(feature = "cstr_macro", issue = "101607")]
+pub use core::ffi::cstr;
+
 #[stable(feature = "core_c_void", since = "1.30.0")]
 pub use core::ffi::c_void;
 

Diff for: library/std/src/lib.rs

@@ -616,9 +616,6 @@ pub use core::{
     module_path, option_env, stringify, trace_macros,
 };
 
-#[unstable(feature = "cstr_macro", issue = "101607")]
-pub use core::cstr;
-
 #[unstable(
     feature = "concat_bytes",
     issue = "87555",