about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2010-07-02 16:27:39 -0700
committerGraydon Hoare <graydon@mozilla.com>2010-07-02 16:27:39 -0700
commit8660ce50a134a74bc841f32e50eb1eab83f8b45b (patch)
treeaeb7795b09c1d2507198cfa8642ef797d685bc8f /src/test
parent026cdf97474402f206a8627a533809c4751abe8b (diff)
parent5a07e98c5d8f61ff5d1efd28c36337a30d6e86d6 (diff)
downloadrust-8660ce50a134a74bc841f32e50eb1eab83f8b45b.tar.gz
rust-8660ce50a134a74bc841f32e50eb1eab83f8b45b.zip
Merge branch 'master' of git@github.com:graydon/rust into exterior_and_mutable_types
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/generic-fn-twice.rs10
-rw-r--r--src/test/run-pass/generic-obj.rs2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/run-pass/generic-fn-twice.rs b/src/test/run-pass/generic-fn-twice.rs
new file mode 100644
index 00000000000..0c6257f8874
--- /dev/null
+++ b/src/test/run-pass/generic-fn-twice.rs
@@ -0,0 +1,10 @@
+// -*- rust -*-
+
+mod foomod {
+  fn foo[T]() {}
+}
+
+fn main() {
+  foomod.foo[int]();
+  foomod.foo[int]();
+}
diff --git a/src/test/run-pass/generic-obj.rs b/src/test/run-pass/generic-obj.rs
index 414aaff46a2..1ff7d180a7f 100644
--- a/src/test/run-pass/generic-obj.rs
+++ b/src/test/run-pass/generic-obj.rs
@@ -11,7 +11,7 @@ obj buf[T](tup(T,T,T) data) {
     }
   }
 
-  fn take(T t) {}
+  fn take(&T t) {}
 }
 
 fn main() {