diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-06-24 23:11:57 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-06-24 23:14:42 -0700 |
| commit | f6bfd2c65ba2a1292be1e62dd1c61a70abccdd1a (patch) | |
| tree | efdda7183699eaa7975d895e34bb6269c5f20323 /src/test/bench | |
| parent | 7a93beef7f692b34168ad69633f56483d38ad8fc (diff) | |
| download | rust-f6bfd2c65ba2a1292be1e62dd1c61a70abccdd1a.tar.gz rust-f6bfd2c65ba2a1292be1e62dd1c61a70abccdd1a.zip | |
librustc: Remove cross borrowing from mutable `Box`es to `&mut`.
This will break code like:
fn f(x: &mut int) {}
let mut a = box 1i;
f(a);
Change it to:
fn f(x: &mut int) {}
let mut a = box 1i;
f(&mut *a);
RFC 33; issue #10504.
[breaking-change]
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/shootout-k-nucleotide.rs | 12 | ||||
| -rw-r--r-- | src/test/bench/sudoku.rs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 9b2b46d0a5a..fe0744e5e7c 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -115,16 +115,16 @@ impl Table { count: 0, next: None, }; - c.f(entry); + c.f(&mut *entry); item.next = Some(entry); } Some(ref mut entry) => { if entry.code == key { - c.f(*entry); + c.f(&mut **entry); return; } - Table::search_remainder(*entry, key, c) + Table::search_remainder(&mut **entry, key, c) } } } @@ -139,7 +139,7 @@ impl Table { count: 0, next: None, }; - c.f(entry); + c.f(&mut *entry); *self.items.get_mut(index as uint) = Some(entry); return; } @@ -148,11 +148,11 @@ impl Table { { let entry = &mut *self.items.get_mut(index as uint).get_mut_ref(); if entry.code == key { - c.f(*entry); + c.f(&mut **entry); return; } - Table::search_remainder(*entry, key, c) + Table::search_remainder(&mut **entry, key, c) } } diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 4a81deaf529..f0988bcfcf4 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -138,7 +138,7 @@ impl Sudoku { let mut avail = box Colors::new(start_color); // drop colors already in use in neighbourhood - self.drop_colors(avail, row, col); + self.drop_colors(&mut *avail, row, col); // find first remaining color that is available let next = avail.next(); |
