Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 04:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

still do not fully understand what PhantomData is *for* exactly (#991)

Browse source 
but standardized naming and usage to match https://doc.rust-lang.org/beta/nomicon/phantom-data.html
so at least it looks similar to the official docs
This commit is contained in:
Antioch Peverell 2018-04-21 17:03:45 -04:00 committed by GitHub
parent 77172057ff
commit ced6e647b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/core/pmmr.rs
View file

@ -36,7 +36,7 @@
//! either be a simple Vec or a database. //! either be a simple Vec or a database.
use std::clone::Clone; use std::clone::Clone;
use std::marker::PhantomData; use std::marker;
use core::hash::Hash; use core::hash::Hash;
use ser; use ser;
use ser::{Readable, Reader, Writeable, Writer}; use ser::{Readable, Reader, Writeable, Writer};
@ -268,7 +268,7 @@ where
last_pos: u64, last_pos: u64,
backend: &'a mut B, backend: &'a mut B,
// only needed for parameterizing Backend // only needed for parameterizing Backend
writeable: PhantomData<T>, _marker: marker::PhantomData<T>,
} }
impl<'a, T, B> PMMR<'a, T, B> impl<'a, T, B> PMMR<'a, T, B>
@ -281,7 +281,7 @@ where
PMMR { PMMR {
last_pos: 0, last_pos: 0,
backend: backend, backend: backend,
writeable: PhantomData, _marker: marker::PhantomData,
} }
} }
@ -292,7 +292,7 @@ where
PMMR { PMMR {
last_pos: last_pos, last_pos: last_pos,
backend: backend, backend: backend,
writeable: PhantomData, _marker: marker::PhantomData,
} }
} }

6
store/src/lib.rs
View file

@ -41,7 +41,7 @@ const SEP: u8 = ':' as u8;
use std::fmt; use std::fmt;
use std::iter::Iterator; use std::iter::Iterator;
use std::marker::PhantomData; use std::marker;
use std::sync::RwLock; use std::sync::RwLock;
use byteorder::{BigEndian, WriteBytesExt}; use byteorder::{BigEndian, WriteBytesExt};
@ -167,7 +167,7 @@ impl Store {
let db = self.rdb.read().unwrap(); let db = self.rdb.read().unwrap();
SerIterator { SerIterator {
iter: db.iterator(IteratorMode::From(from, Direction::Forward)), iter: db.iterator(IteratorMode::From(from, Direction::Forward)),
_marker: PhantomData, _marker: marker::PhantomData,
} }
} }
@ -225,7 +225,7 @@ where
T: ser::Readable, T: ser::Readable,
{ {
iter: DBIterator, iter: DBIterator,
_marker: PhantomData<T>, _marker: marker::PhantomData<T>,
} }
impl<T> Iterator for SerIterator<T> impl<T> Iterator for SerIterator<T>

6
store/src/pmmr.rs
View file

@ -15,7 +15,7 @@
use std::fs; use std::fs;
use std::io; use std::io;
use std::marker::PhantomData; use std::marker;
use core::core::pmmr::{self, family, Backend}; use core::core::pmmr::{self, family, Backend};
use core::ser::{self, PMMRable, Readable, Reader, Writeable, Writer}; use core::ser::{self, PMMRable, Readable, Reader, Writeable, Writer};
@ -92,7 +92,7 @@ where
data_file: AppendOnlyFile, data_file: AppendOnlyFile,
rm_log: RemoveLog, rm_log: RemoveLog,
pruned_nodes: pmmr::PruneList, pruned_nodes: pmmr::PruneList,
phantom: PhantomData<T>, _marker: marker::PhantomData<T>,
} }
impl<T> Backend<T> for PMMRBackend<T> impl<T> Backend<T> for PMMRBackend<T>
@ -257,7 +257,7 @@ where
pruned_nodes: pmmr::PruneList { pruned_nodes: pmmr::PruneList {
pruned_nodes: prune_list, pruned_nodes: prune_list,
}, },
phantom: PhantomData, _marker: marker::PhantomData,
}) })
} }