forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
librustc: Make references to functions not have static lifetime.
This breaks code like: struct A<'a> { func: &'a fn() -> Option<int> } fn foo() -> Option<int> { ... } fn create() -> A<'static> { A { func: &foo } } Change this code to not take functions by reference. For example: struct A { func: extern "Rust" fn() -> Option<int> } fn foo() -> Option<int> { ... } fn create() -> A { A { func: foo } } Closes rust-lang#13595. [breaking-change]
- Loading branch information
Showing
3 changed files
with
95 additions
and
3 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// 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. | ||
|
||
struct A<'a> { | ||
func: &'a fn() -> Option<int> | ||
} | ||
|
||
impl<'a> A<'a> { | ||
fn call(&self) -> Option<int> { | ||
(*self.func)() | ||
} | ||
} | ||
|
||
fn foo() -> Option<int> { | ||
None | ||
} | ||
|
||
fn create() -> A<'static> { | ||
A { | ||
func: &foo, //~ ERROR borrowed value does not live long enough | ||
} | ||
} | ||
|
||
fn main() { | ||
let a = create(); | ||
a.call(); | ||
} |
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,58 @@ | ||
// 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. | ||
|
||
struct StateMachineIter<'a> { | ||
statefn: &'a fn(&mut StateMachineIter<'a>) -> Option<&'static str> | ||
} | ||
|
||
impl<'a> Iterator<&'static str> for StateMachineIter<'a> { | ||
fn next(&mut self) -> Option<&'static str> { | ||
return (*self.statefn)(self); | ||
} | ||
} | ||
|
||
fn state1(self_: &mut StateMachineIter) -> Option<&'static str> { | ||
self_.statefn = &state2; | ||
//~^ ERROR borrowed value does not live long enough | ||
return Some("state1"); | ||
} | ||
|
||
fn state2(self_: &mut StateMachineIter) -> Option<(&'static str)> { | ||
self_.statefn = &state3; | ||
//~^ ERROR borrowed value does not live long enough | ||
return Some("state2"); | ||
} | ||
|
||
fn state3(self_: &mut StateMachineIter) -> Option<(&'static str)> { | ||
self_.statefn = &finished; | ||
//~^ ERROR borrowed value does not live long enough | ||
return Some("state3"); | ||
} | ||
|
||
fn finished(_: &mut StateMachineIter) -> Option<(&'static str)> { | ||
return None; | ||
} | ||
|
||
fn state_iter() -> StateMachineIter<'static> { | ||
StateMachineIter { | ||
statefn: &state1 //~ ERROR borrowed value does not live long enough | ||
} | ||
} | ||
|
||
|
||
fn main() { | ||
let mut it = state_iter(); | ||
println!("{}",it.next()); | ||
println!("{}",it.next()); | ||
println!("{}",it.next()); | ||
println!("{}",it.next()); | ||
println!("{}",it.next()); | ||
} | ||
|
d1dcd19
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.
r+