From dee54244a68c33df5bcb375c3138a42aa80acb50 Mon Sep 17 00:00:00 2001
From: Lukas Lueg <lukas.lueg@gmail.com>
Date: Sun, 14 Feb 2021 22:39:47 +0100
Subject: [PATCH 1/2] Add missing env!-decl variant

Resolves #82117
---
 library/core/src/macros/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
index 7aaf5a5fd46..82272c451c3 100644
--- a/library/core/src/macros/mod.rs
+++ b/library/core/src/macros/mod.rs
@@ -816,6 +816,7 @@ pub(crate) mod builtin {
     #[macro_export]
     macro_rules! env {
         ($name:expr $(,)?) => {{ /* compiler built-in */ }};
+        ($name:expr, $error_msg:expr) => {{ /* compiler built-in */ }};
     }
 
     /// Optionally inspects an environment variable at compile time.

From 3d7fcfff76452202a5da532b7cd790fdc53e988b Mon Sep 17 00:00:00 2001
From: lukaslueg <lukas.lueg@gmail.com>
Date: Sun, 14 Feb 2021 23:33:43 +0100
Subject: [PATCH 2/2] Update library/core/src/macros/mod.rs

Co-authored-by: Joshua Nelson <joshua@yottadb.com>
---
 library/core/src/macros/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
index 82272c451c3..b3802c1abde 100644
--- a/library/core/src/macros/mod.rs
+++ b/library/core/src/macros/mod.rs
@@ -816,7 +816,7 @@ pub(crate) mod builtin {
     #[macro_export]
     macro_rules! env {
         ($name:expr $(,)?) => {{ /* compiler built-in */ }};
-        ($name:expr, $error_msg:expr) => {{ /* compiler built-in */ }};
+        ($name:expr, $error_msg:expr $(,)?) => {{ /* compiler built-in */ }};
     }
 
     /// Optionally inspects an environment variable at compile time.