user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

librustc: Disallow &mut loans from overlapping with any other loans

Browse source
This commit is contained in:
Patrick Walton 2013-01-17 16:15:08 -08:00
parent 163b97b7bb
commit bbbb80559c
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/sort.rs
View file

@ -630,9 +630,15 @@ impl<T: Copy Ord> MergeState<T> {
dest -= 1; c2 -= 1; len2 -= 1;
if len2 == 1 { break_outer = true; break; }
let tmp_view = vec::mut_view(tmp, 0, len2);
let count2 = len2 - gallop_left(&const array[c1],
tmp_view, len2-1);
let count2;
{
let tmp_view = vec::mut_view(tmp, 0, len2);
count2 = len2 - gallop_left(&const array[c1],
tmp_view,
len2-1);
// Make tmp_view go out of scope to appease borrowck.
}
if count2 != 0 {
dest -= count2; c2 -= count2; len2 -= count2;
copy_vec(array, dest+1, tmp, c2+1, count2);