Update borrowck tests to test that index is by-move now

src/test/compile-fail/borrowck-overloaded-index-2.rs → src/test/compile-fail/borrowck-overloaded-index-move-from-vec.rs

@@ -19,7 +19,7 @@ struct MyVec<T> {
 impl<T> Index<usize> for MyVec<T> {
  type Output = T;
 
- fn index(&self, &i: &usize) -> &T {
+ fn index(&self, i: usize) -> &T {
  &self.data[i]
  }
 }

src/test/compile-fail/borrowck-overloaded-index-move-index.rs

@@ -0,0 +1,74 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::ops::{Index, IndexMut};
+
+struct Foo {
+ x: isize,
+ y: isize,
+}
+
+impl Index<String> for Foo {
+ type Output = isize;
+
+ fn index(&self, z: String) -> &isize {
+ if z == "x" {
+ &self.x
+ } else {
+ &self.y
+ }
+ }
+}
+
+impl IndexMut<String> for Foo {
+ fn index_mut(&mut self, z: String) -> &mut isize {
+ if z == "x" {
+ &mut self.x
+ } else {
+ &mut self.y
+ }
+ }
+}
+
+struct Bar {
+ x: isize,
+}
+
+impl Index<isize> for Bar {
+ type Output = isize;
+
+ fn index<'a>(&'a self, z: isize) -> &'a isize {
+ &self.x
+ }
+}
+
+fn main() {
+ let mut f = Foo {
+ x: 1,
+ y: 2,
+ };
+ let mut s = "hello".to_string();
+ let rs = &mut s;
+
+ println!("{}", f[s]);
+ //~^ ERROR cannot move out of `s` because it is borrowed
+
+ f[s] = 10;
+ //~^ ERROR cannot move out of `s` because it is borrowed
+ //~| ERROR use of moved value: `s`
+
+ let s = Bar {
+ x: 1,
+ };
+ let i = 2;
+ let _j = &i;
+ println!("{}", s[i]); // no error, i is copy
+ println!("{}", s[i]);
+}

src/test/compile-fail/borrowck-overloaded-index.rs → src/test/compile-fail/borrowck-overloaded-index-ref-index.rs

@@ -15,10 +15,10 @@ struct Foo {
  y: isize,
 }
 
-impl Index<String> for Foo {
+impl<'a> Index<&'a String> for Foo {
  type Output = isize;
 
- fn index<'a>(&'a self, z: &String) -> &'a isize {
+ fn index(&self, z: &String) -> &isize {
  if *z == "x" {
  &self.x
  } else {
@@ -27,8 +27,8 @@ impl Index<String> for Foo {
  }
 }
 
-impl IndexMut<String> for Foo {
- fn index_mut<'a>(&'a mut self, z: &String) -> &'a mut isize {
+impl<'a> IndexMut<&'a String> for Foo {
+ fn index_mut(&mut self, z: &String) -> &mut isize {
  if *z == "x" {
  &mut self.x
  } else {
@@ -44,7 +44,7 @@ struct Bar {
 impl Index<isize> for Bar {
  type Output = isize;
 
- fn index<'a>(&'a self, z: &isize) -> &'a isize {
+ fn index<'a>(&'a self, z: isize) -> &'a isize {
  &self.x
  }
 }
@@ -56,9 +56,9 @@ fn main() {
  };
  let mut s = "hello".to_string();
  let rs = &mut s;
- println!("{}", f[s]);
+ println!("{}", f[&s]);
  //~^ ERROR cannot borrow `s` as immutable because it is also borrowed as mutable
- f[s] = 10;
+ f[&s] = 10;
  //~^ ERROR cannot borrow `s` as immutable because it is also borrowed as mutable
  let s = Bar {
  x: 1,