M-Labs/libfringe
3
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that the Input/Output types outlive the generator [breaking-change]

Browse Source 
Previously, it was possible to cause unsafety by sending a short-lived
value into or out of the generator.
This commit is contained in:
edef 2016-09-15 02:35:48 -04:00
parent 59f28e92cb
commit 045ad33785
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/generator.rs
View File

@ -80,7 +80,7 @@ pub enum State {
/// println!("{:?}", nat.next()); // prints Some(2)
/// ```
#[derive(Debug)]
pub struct Generator<'a, Input: Send, Output: Send, Stack: stack::Stack> {
pub struct Generator<'a, Input: Send + 'a, Output: Send + 'a, Stack: stack::Stack> {
state: State,
stack: Stack,
stack_id: debug::StackId,
@ -89,7 +89,7 @@ pub struct Generator<'a, Input: Send, Output: Send, Stack: stack::Stack> {
}
impl<'a, Input, Output, Stack> Generator<'a, Input, Output, Stack>
where Input: Send, Output: Send, Stack: stack::Stack {
where Input: Send + 'a, Output: Send + 'a, Stack: stack::Stack {
/// Creates a new generator.
///
/// See also the [contract](../trait.GuardedStack.html) that needs to be fulfilled by `stack`.
@ -219,7 +219,7 @@ impl<Input, Output> Yielder<Input, Output>
}
impl<'a, Output, Stack> Iterator for Generator<'a, (), Output, Stack>
where Output: Send, Stack: stack::Stack {
where Output: Send + 'a, Stack: stack::Stack {
type Item = Output;
fn next(&mut self) -> Option<Self::Item> { self.resume(()) }