-
Notifications
You must be signed in to change notification settings - Fork 12.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #49392 - retep007:nll-issue-48962, r=nikomatsakis
fixes move analysis Fixed compiler error by correct checking when dereferencing Fix #48962 r? @nikomatsakis
- Loading branch information
Showing
4 changed files
with
167 additions
and
23 deletions.
There are no files selected for viewing
This file contains 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 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 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,38 @@ | ||
| // Copyright 2018 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. | ||
|
|
||
| #![feature(nll)] | ||
|
|
||
| struct Node { | ||
| elem: i32, | ||
| next: Option<Box<Node>>, | ||
| } | ||
|
|
||
| fn a() { | ||
| let mut node = Node { | ||
| elem: 5, | ||
| next: None, | ||
| }; | ||
|
|
||
| let mut src = &mut node; | ||
| {src}; | ||
| src.next = None; //~ ERROR use of moved value: `src` [E0382] | ||
| } | ||
|
|
||
| fn b() { | ||
| let mut src = &mut (22, 44); | ||
| {src}; | ||
| src.0 = 66; //~ ERROR use of moved value: `src` [E0382] | ||
| } | ||
|
|
||
| fn main() { | ||
| a(); | ||
| b(); | ||
| } |
This file contains 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,43 @@ | ||
| // Copyright 2018 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 we are able to reinitilize box with moved referent | ||
| #![feature(nll)] | ||
| static mut ORDER: [usize; 3] = [0, 0, 0]; | ||
| static mut INDEX: usize = 0; | ||
|
|
||
| struct Dropee (usize); | ||
|
|
||
| impl Drop for Dropee { | ||
| fn drop(&mut self) { | ||
| unsafe { | ||
| ORDER[INDEX] = self.0; | ||
| INDEX = INDEX + 1; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn add_sentintel() { | ||
| unsafe { | ||
| ORDER[INDEX] = 2; | ||
| INDEX = INDEX + 1; | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| let mut x = Box::new(Dropee(1)); | ||
| *x; // move out from `*x` | ||
| add_sentintel(); | ||
| *x = Dropee(3); // re-initialize `*x` | ||
| {x}; // drop value | ||
| unsafe { | ||
| assert_eq!(ORDER, [1, 2, 3]); | ||
| } | ||
| } |