From 3d972489a827f5d4cb30785eb52bc7fde6b83297 Mon Sep 17 00:00:00 2001 From: Thomas Mühlbacher Date: Fri, 21 Mar 2025 16:33:59 +0000 Subject: fix(key): replace c_str macro with `c""` literal According to the MSRV in Cargo.toml, we can use this now. Signed-off-by: Kent Overstreet --- src/commands/mod.rs | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'src/commands/mod.rs') diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 7f466f92..fd15bb38 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -25,28 +25,3 @@ enum Subcommands { #[command(visible_aliases = ["subvol"])] Subvolume(subvolume::Cli), } - -// FIXME: Can be removed after bumping MSRV >= 1.77 in favor of `c""` literals -#[macro_export] -macro_rules! c_str { - ($lit:expr) => { - ::std::ffi::CStr::from_bytes_with_nul(concat!($lit, "\0").as_bytes()) - .unwrap() - .as_ptr() - }; -} - -#[cfg(test)] -mod tests { - use std::ffi::CStr; - - #[test] - fn check_cstr_macro() { - let literal = c_str!("hello"); - - assert_eq!( - literal, - CStr::from_bytes_with_nul(b"hello\0").unwrap().as_ptr() - ); - } -} -- cgit v1.2.3