From 17cd3903080f6fea839f3231060212fcee0e4b5c Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 6 Oct 2019 12:59:11 -0400
Subject: [PATCH] Simplify handling of trailing commas

---
 src/lib.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 65eccc8..3a86721 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -190,12 +190,9 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// This macro is equivalent to `return Err(From::from($err))`.
 #[macro_export]
 macro_rules! bail {
-    ($err:expr) => {
+    ($err:expr $(,)?) => {
         return std::result::Result::Err(std::convert::From::from($err));
     };
-    ($err:expr,) => {
-        $crate::bail!($err);
-    };
 }
 
 /// Construct an ad-hoc error from a string.
@@ -205,12 +202,9 @@ macro_rules! bail {
 /// `Debug` and `Display`.
 #[macro_export]
 macro_rules! anyhow {
-    ($msg:expr) => {
+    ($msg:expr $(,)?) => {
         $crate::private::new_adhoc($msg)
     };
-    ($msg:expr,) => {
-        $crate::anyhow!($msg)
-    };
     ($fmt:expr, $($arg:tt)*) => {
         $crate::private::new_adhoc(format!($fmt, $($arg)*))
     };