From 5b0bbc011acc40d3123a8f1cb53f46d463790510 Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Tue, 24 Oct 2017 20:38:09 +0300 Subject: [PATCH] Simplify im_str macro --- src/lib.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 09ef463..2cd3205 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -71,13 +71,12 @@ pub struct ImGui { #[macro_export] macro_rules! im_str { ($e:tt) => ({ - let value = concat!($e, "\0"); - unsafe { ::imgui::ImStr::from_utf8_with_nul_unchecked(value.as_bytes()) } + unsafe { + ::imgui::ImStr::from_utf8_with_nul_unchecked(concat!($e, "\0").as_bytes()) + } }); ($e:tt, $($arg:tt)*) => ({ - let mut bytes: Vec = format!($e, $($arg)*).into(); - bytes.push(b'\0'); - unsafe { &::imgui::ImString::from_utf8_unchecked(bytes) } + &::imgui::ImString::new(format!($e, $($arg)*)) }) }