From cce7327487e113d1d38c7771a187d3ad29dc0011 Mon Sep 17 00:00:00 2001
From: Lindsey Kuper <lindsey@rockstargirl.org>
Date: Wed, 13 Jun 2012 11:08:21 -0700
Subject: [PATCH] Allow trailing commas in import lists.  Closes #2582.

---
 src/libsyntax/parse/parser.rs              |  2 +-
 src/test/run-pass/import-trailing-comma.rs | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/test/run-pass/import-trailing-comma.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 975e9031877..e0029b2a222 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2414,7 +2414,7 @@ class parser {
                   token::LBRACE {
                     let idents = self.parse_unspanned_seq(
                         token::LBRACE, token::RBRACE,
-                        seq_sep_trailing_disallowed(token::COMMA),
+                        seq_sep_trailing_allowed(token::COMMA),
                         {|p| p.parse_path_list_ident()});
                     let path = @{span: mk_sp(lo, self.span.hi),
                                  global: false, idents: path,
diff --git a/src/test/run-pass/import-trailing-comma.rs b/src/test/run-pass/import-trailing-comma.rs
new file mode 100644
index 00000000000..a6a56e9009d
--- /dev/null
+++ b/src/test/run-pass/import-trailing-comma.rs
@@ -0,0 +1,10 @@
+import foo::bar::{baz, quux,};
+
+mod foo {
+    mod bar {
+        fn baz() { }
+        fn quux() { }
+    }
+}
+
+fn main() { baz(); quux(); }