auto merge of #17501 : pcwalton/rust/improve-method-lookup-autoderef, r=nikomatsakis
prefer `Deref` over `DerefMut` in all other circumstances.
Because the compiler now prefers `Deref`, this can break code that
looked like:
let mut foo = bar.borrow_mut();
(*foo).call_something_that_requires_mutable_self();
Replace this code with:
let mut foo = bar.baz();
(&mut *foo).call_something_that_requires_mutable_self();
Closes #12825.
[breaking-change]
r? @nikomatsakis
This commit is contained in:
commit
60e7317345
8 changed files with 154 additions and 10 deletions
|
|
@ -27,7 +27,6 @@ impl DerefMut<[uint]> for Arr {
|
|||
}
|
||||
|
||||
pub fn foo(arr: &mut Arr) {
|
||||
assert!(arr.len() == 3);
|
||||
let x: &mut [uint] = &mut **arr;
|
||||
assert!(x[0] == 1);
|
||||
assert!(x[1] == 2);
|
||||
|
|
|
|||
52
src/test/run-pass/fixup-deref-mut.rs
Normal file
52
src/test/run-pass/fixup-deref-mut.rs
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
// 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.
|
||||
|
||||
// Generic unique/owned smaht pointer.
|
||||
struct Own<T> {
|
||||
value: *mut T
|
||||
}
|
||||
|
||||
impl<T> Deref<T> for Own<T> {
|
||||
fn deref<'a>(&'a self) -> &'a T {
|
||||
unsafe { &*self.value }
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> DerefMut<T> for Own<T> {
|
||||
fn deref_mut<'a>(&'a mut self) -> &'a mut T {
|
||||
unsafe { &mut *self.value }
|
||||
}
|
||||
}
|
||||
|
||||
struct Point {
|
||||
x: int,
|
||||
y: int
|
||||
}
|
||||
|
||||
impl Point {
|
||||
fn get(&mut self) -> (int, int) {
|
||||
(self.x, self.y)
|
||||
}
|
||||
}
|
||||
|
||||
fn test0(mut x: Own<Point>) {
|
||||
let _ = x.get();
|
||||
}
|
||||
|
||||
fn test1(mut x: Own<Own<Own<Point>>>) {
|
||||
let _ = x.get();
|
||||
}
|
||||
|
||||
fn test2(mut x: Own<Own<Own<Point>>>) {
|
||||
let _ = (**x).get();
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ pub fn main() {
|
|||
assert_eq!(p.counts(), (2, 2));
|
||||
|
||||
p.get();
|
||||
assert_eq!(p.counts(), (2, 3));
|
||||
assert_eq!(p.counts(), (3, 2));
|
||||
|
||||
// Check the final state.
|
||||
assert_eq!(*p, Point {x: 3, y: 0});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue