about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIsaac van Bakel <ivb@vanbakel.io>2018-01-01 22:49:01 +0000
committerIsaac van Bakel <ivb@vanbakel.io>2018-01-07 01:30:21 +0000
commitbf199d49652df2561459f39ff4f6f9ea02989999 (patch)
tree2e081b797a1c2fe326cf0dfad7dade29b7729790
parent23bc6418e844cbb9170ecf37f87df20742fcf7a2 (diff)
downloadrust-bf199d49652df2561459f39ff4f6f9ea02989999.tar.gz
rust-bf199d49652df2561459f39ff4f6f9ea02989999.zip
Added tests for non-obvious builtin indexing
Tests match issues opened on Github.
Tests would not previously compile and pass.
-rw-r--r--src/test/run-pass/issue-33903.rs19
-rw-r--r--src/test/run-pass/issue-46095.rs39
2 files changed, 58 insertions, 0 deletions
diff --git a/src/test/run-pass/issue-33903.rs b/src/test/run-pass/issue-33903.rs
new file mode 100644
index 00000000000..ab368537e21
--- /dev/null
+++ b/src/test/run-pass/issue-33903.rs
@@ -0,0 +1,19 @@
+// Copyright 2017 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.
+
+// Issue 33903:
+// Built-in indexing should be used even when the index is not
+// trivially an integer
+// Only built-in indexing can be used in constant expresssions
+
+const FOO: i32 = [12, 34][0 + 1];
+
+fn main() {}
+
diff --git a/src/test/run-pass/issue-46095.rs b/src/test/run-pass/issue-46095.rs
new file mode 100644
index 00000000000..35e51ebe70b
--- /dev/null
+++ b/src/test/run-pass/issue-46095.rs
@@ -0,0 +1,39 @@
+// Copyright 2017 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.
+
+struct A;
+
+impl A {
+    fn take_mutably(&mut self) {}
+}
+
+fn identity<T>(t: T) -> T {
+    t
+}
+
+// Issue 46095
+// Built-in indexing should be used even when the index is not
+// trivially an integer
+// Overloaded indexing would cause wrapped to be borrowed mutably
+
+fn main() {
+    let mut a1 = A;
+    let mut a2 = A;
+
+    let wrapped = [&mut a1, &mut a2];
+
+    {
+        wrapped[0 + 1 - 1].take_mutably();
+    }
+
+    {
+        wrapped[identity(0)].take_mutably();
+    }
+}