From 906954c6e4c7f68cf31ca3b31b4b4dc8cc869d52 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 17 Jul 2015 23:51:55 +0200
Subject: [PATCH 1/2] Add end comma for register_diagnostics macro

---
 src/libsyntax/diagnostics/macros.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libsyntax/diagnostics/macros.rs b/src/libsyntax/diagnostics/macros.rs
index 055ade46a3f01..8c2d2a251aab8 100644
--- a/src/libsyntax/diagnostics/macros.rs
+++ b/src/libsyntax/diagnostics/macros.rs
@@ -63,6 +63,9 @@ macro_rules! fileline_help {
 macro_rules! register_diagnostics {
     ($($code:tt),*) => (
         $(register_diagnostic! { $code })*
+    );
+    ($($code:tt),*,) => (
+        $(register_diagnostic! { $code })*
     )
 }
 

From f3c427d62b4da4ead8d5164fb65088cac3709160 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 17 Jul 2015 23:52:22 +0200
Subject: [PATCH 2/2] Add end comma for register_long_diagnostics macro

---
 src/libsyntax/diagnostics/macros.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libsyntax/diagnostics/macros.rs b/src/libsyntax/diagnostics/macros.rs
index 8c2d2a251aab8..669b930ecc92e 100644
--- a/src/libsyntax/diagnostics/macros.rs
+++ b/src/libsyntax/diagnostics/macros.rs
@@ -73,5 +73,8 @@ macro_rules! register_diagnostics {
 macro_rules! register_long_diagnostics {
     ($($code:tt: $description:tt),*) => (
         $(register_diagnostic! { $code, $description })*
+    );
+    ($($code:tt: $description:tt),*,) => (
+        $(register_diagnostic! { $code, $description })*
     )
 }