From 96f91ca09281aa76a4d4796e082b32c0e158f968 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Fri, 12 Aug 2022 13:07:29 -0500
Subject: [PATCH] refactor(assert): Make it easier to change id type

Compared to `master` on `06_rustup`:
- build: 5.74us -> 6.21us
- parse: 7.57us -> 7.55us
- parse_sc: 7.60us -> 7.95us
---
 src/macros.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/macros.rs b/src/macros.rs
index 504b30650d9..b11bfcacf49 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -204,7 +204,7 @@ macro_rules! arg_impl {
 
                 let mut arg = $arg;
                 let long = $crate::arg_impl! { @string $long };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(long);
                 }
                 let action = $crate::ArgAction::SetTrue;
@@ -229,7 +229,7 @@ macro_rules! arg_impl {
 
                 let mut arg = $arg;
                 let long = $crate::arg_impl! { @string $long };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(long);
                 }
                 let action = $crate::ArgAction::SetTrue;
@@ -299,7 +299,7 @@ macro_rules! arg_impl {
                 arg = arg.required(true);
 
                 let value_name = $crate::arg_impl! { @string $value_name };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(value_name);
                 }
                 arg
@@ -326,7 +326,7 @@ macro_rules! arg_impl {
                 arg = arg.required(true);
 
                 let value_name = $crate::arg_impl! { @string $value_name };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(value_name);
                 }
                 arg
@@ -357,7 +357,7 @@ macro_rules! arg_impl {
                 }
 
                 let value_name = $crate::arg_impl! { @string $value_name };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(value_name);
                 }
                 arg
@@ -388,7 +388,7 @@ macro_rules! arg_impl {
                 }
 
                 let value_name = $crate::arg_impl! { @string $value_name };
-                if arg.get_id().is_empty() {
+                if arg.get_id() == "" {
                     arg = arg.id(value_name);
                 }
                 arg
@@ -536,7 +536,7 @@ macro_rules! arg {
         let arg = $crate::arg_impl! {
             @arg ($crate::Arg::default()) $($tail)+
         };
-        debug_assert!(!arg.get_id().is_empty(), "Without a value or long flag, the `name:` prefix is required");
+        debug_assert_ne!(arg.get_id(), "", "Without a value or long flag, the `name:` prefix is required");
         arg
     }};
 }