From 85a701c8f668fc03e6340682956e7ca7d9cf54bc Mon Sep 17 00:00:00 2001
From: Roy Frostig <rfrostig@mozilla.com>
Date: Fri, 25 Jun 2010 01:26:44 -0700
Subject: [PATCH] Add testcases for item name conflict at the same path level.

---
 src/Makefile                                |  1 +
 src/test/compile-fail/item-name-overload.rs |  8 ++++++++
 src/test/run-pass/item-name-overload.rs     | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 src/test/compile-fail/item-name-overload.rs
 create mode 100644 src/test/run-pass/item-name-overload.rs

diff --git a/src/Makefile b/src/Makefile
index 2c53a30bb2d..0b6315462b0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -374,6 +374,7 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
                       i8-incr.rs \
                       import.rs \
                       inner-module.rs \
+                      item-name-overload.rs \
                       large-records.rs \
                       lazy-and-or.rs \
                       lazychan.rs \
diff --git a/src/test/compile-fail/item-name-overload.rs b/src/test/compile-fail/item-name-overload.rs
new file mode 100644
index 00000000000..06429c763bc
--- /dev/null
+++ b/src/test/compile-fail/item-name-overload.rs
@@ -0,0 +1,8 @@
+// -*- rust -*-
+
+mod foo {
+  fn bar[T](T f) -> int { ret 17; }
+  type bar[U, T] = tup(int, U, T);
+}
+
+fn main() {}
diff --git a/src/test/run-pass/item-name-overload.rs b/src/test/run-pass/item-name-overload.rs
new file mode 100644
index 00000000000..2b0a70e04a3
--- /dev/null
+++ b/src/test/run-pass/item-name-overload.rs
@@ -0,0 +1,11 @@
+// -*- rust -*-
+
+mod foo {
+  fn baz() {}
+}
+
+mod bar {
+  fn baz() {}
+}
+
+fn main() {}