-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Issue #9629 -- permit freezing &mut
found within an &
pointer
#10787
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
22f14fb
Issue #9629 -- permit freezing `&mut` found within an `&` pointer
nikomatsakis 9f7baed
Address nits for PR for #9629
nikomatsakis 1252947
Make main pub in test case (cc #9629)
nikomatsakis 76d9a96
Fix test case harder (cc #9629)
nikomatsakis fc74d64
More small test case fixes. grr. cc #9629.
nikomatsakis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Copyright 2013 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. | ||
|
||
// Test that attempt to freeze an `&mut` pointer while referent is | ||
// claimed yields an error. | ||
// | ||
// Example from src/middle/borrowck/doc.rs | ||
|
||
use std::util::swap; | ||
|
||
fn foo<'a>(mut t0: &'a mut int, | ||
mut t1: &'a mut int) { | ||
let p: &mut int = &mut *t0; // Claims `*t0` | ||
let mut t2 = &t0; //~ ERROR cannot borrow `t0` | ||
let q: &int = &*t2; // Freezes `*t0` but not through `*p` | ||
*p += 1; // violates type of `*q` | ||
} | ||
|
||
fn main() { | ||
} |
33 changes: 33 additions & 0 deletions
33
src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// Copyright 2013 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. | ||
|
||
// Test that attempt to mutably borrow `&mut` pointer while pointee is | ||
// borrowed yields an error. | ||
// | ||
// Example from src/middle/borrowck/doc.rs | ||
|
||
use std::util::swap; | ||
|
||
fn foo<'a>(mut t0: &'a mut int, | ||
mut t1: &'a mut int) { | ||
let p: &int = &*t0; // Freezes `*t0` | ||
let mut t2 = &mut t0; //~ ERROR cannot borrow `t0` | ||
**t2 += 1; // Mutates `*t0` | ||
} | ||
|
||
fn bar<'a>(mut t0: &'a mut int, | ||
mut t1: &'a mut int) { | ||
let p: &mut int = &mut *t0; // Claims `*t0` | ||
let mut t2 = &mut t0; //~ ERROR cannot borrow `t0` | ||
**t2 += 1; // Mutates `*t0` but not through `*p` | ||
} | ||
|
||
fn main() { | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// Copyright 2013 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. | ||
|
||
// Test that freezing an `&mut` pointer while referent is | ||
// frozen is legal. | ||
// | ||
// Example from src/middle/borrowck/doc.rs | ||
|
||
fn foo<'a>(mut t0: &'a mut int, | ||
mut t1: &'a mut int) { | ||
let p: &int = &*t0; // Freezes `*t0` | ||
let mut t2 = &t0; | ||
let q: &int = &**t2; // Freezes `*t0`, but that's ok... | ||
let r: &int = &*t0; // ...after all, could do same thing directly. | ||
} | ||
|
||
fn main() { | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// Copyright 2012-2013 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. | ||
|
||
// Test that a `&mut` inside of an `&` is freezable. | ||
|
||
struct MutSlice<'a, T> { | ||
data: &'a mut [T] | ||
} | ||
|
||
fn get<'a, T>(ms: &'a MutSlice<'a, T>, index: uint) -> &'a T { | ||
&ms.data[index] | ||
} | ||
|
||
fn main() { | ||
let mut data = [1, 2, 3]; | ||
{ | ||
let slice = MutSlice { data: data }; | ||
slice.data[0] += 4; | ||
let index0 = get(&slice, 0); | ||
let index1 = get(&slice, 1); | ||
let index2 = get(&slice, 2); | ||
assert_eq!(*index0, 5); | ||
assert_eq!(*index1, 2); | ||
assert_eq!(*index2, 3); | ||
} | ||
assert_eq!(data[0], 1); | ||
assert_eq!(data[1], 2); | ||
assert_eq!(data[2], 3); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused variable error on
r
is getting flagged here.