auto merge of #18036 : japaric/rust/add-tests, r=nikomatsakis

Closes #11384
Closes #12909

r? @nikomatsakis 

2 files changed, 43 insertions, 0 deletions

diff --git a/src/test/run-pass/issue-11384.rs b/src/test/run-pass/issue-11384.rs
new file mode 100644
index 00000000000..a511149b05e
--- /dev/null
+++ b/src/test/run-pass/issue-11384.rs
@@ -0,0 +1,17 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait Common {}
+
+impl<'t, T> Common for (T, &'t T) {}
+
+impl<'t, T> Common for (&'t T, T) {}
+
+fn main() {}
diff --git a/src/test/run-pass/issue-12909.rs b/src/test/run-pass/issue-12909.rs
new file mode 100644
index 00000000000..dfdf979fcec
--- /dev/null
+++ b/src/test/run-pass/issue-12909.rs
@@ -0,0 +1,26 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::collections::HashMap;
+
+fn copy<T: Copy>(&x: &T) -> T {
+    x
+}
+
+fn main() {
+    let arr = [(1i, 1u), (2, 2), (3, 3)];
+
+    let v1: Vec<&_> = arr.iter().collect();
+    let v2: Vec<_> = arr.iter().map(copy).collect();
+
+    let m1: HashMap<_, _> = arr.iter().map(copy).collect();
+    let m2: HashMap<int, _> = arr.iter().map(copy).collect();
+    let m3: HashMap<_, uint> = arr.iter().map(copy).collect();
+}