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

Use PhantomData-of-tuple instead of tuple-of-PhantomData

This commit is contained in:
edef 2016-09-16 04:57:56 -04:00
parent 7efb3218c4
commit 4e55e2b651
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/generator.rs
View File

@ -85,7 +85,7 @@ pub struct Generator<Input: Send, Output: Send, Stack: stack::Stack> {
stack: Stack, stack: Stack,
stack_id: debug::StackId, stack_id: debug::StackId,
stack_ptr: arch::StackPointer, stack_ptr: arch::StackPointer,
phantom: (PhantomData<*const Input>, PhantomData<*const Output>) phantom: PhantomData<(*const Input, *const Output)>
} }
impl<Input, Output, Stack> Generator<Input, Output, Stack> impl<Input, Output, Stack> Generator<Input, Output, Stack>
@ -135,7 +135,7 @@ impl<Input, Output, Stack> Generator<Input, Output, Stack>
stack: stack, stack: stack,
stack_id: stack_id, stack_id: stack_id,
stack_ptr: stack_ptr, stack_ptr: stack_ptr,
phantom: (PhantomData, PhantomData) phantom: PhantomData
} }
} }
@ -188,7 +188,7 @@ impl<Input, Output, Stack> Generator<Input, Output, Stack>
#[derive(Debug)] #[derive(Debug)]
pub struct Yielder<Input: Send, Output: Send> { pub struct Yielder<Input: Send, Output: Send> {
stack_ptr: Cell<StackPointer>, stack_ptr: Cell<StackPointer>,
phantom: (PhantomData<*const Input>, PhantomData<*const Output>) phantom: PhantomData<(*const Input, *const Output)>
} }
impl<Input, Output> Yielder<Input, Output> impl<Input, Output> Yielder<Input, Output>
@ -196,7 +196,7 @@ impl<Input, Output> Yielder<Input, Output>
fn new(stack_ptr: StackPointer) -> Yielder<Input, Output> { fn new(stack_ptr: StackPointer) -> Yielder<Input, Output> {
Yielder { Yielder {
stack_ptr: Cell::new(stack_ptr), stack_ptr: Cell::new(stack_ptr),
phantom: (PhantomData, PhantomData) phantom: PhantomData
} }
} }