mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

factor the wrapped Index newtype definitions into a macro.

Browse Source
This commit is contained in:
Felix S. Klock II 2016-03-15 11:34:17 +01:00
parent 24ff327484
commit 7d53a25b38
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/librustc_borrowck/borrowck/mir/gather_moves.rs
View File

@ -25,22 +25,32 @@ use std::usize;
use super::dataflow::BitDenotation;
use super::abs_domain::{AbstractElem, Lift};
/// Index into MovePathData.move_paths
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct MovePathIndex(usize);
macro_rules! new_index {
($Index:ident, $INVALID_INDEX:ident) => {
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct $Index(usize);
const INVALID_MOVE_PATH_INDEX: MovePathIndex = MovePathIndex(usize::MAX);
const $INVALID_INDEX: $Index = $Index(usize::MAX);
impl MovePathIndex {
pub fn idx(&self) -> Option<usize> {
if *self == INVALID_MOVE_PATH_INDEX {
None
} else {
Some(self.0)
impl $Index {
pub fn idx(&self) -> Option<usize> {
if *self == $INVALID_INDEX {
None
} else {
Some(self.0)
}
}
}
}
}
/// Index into MovePathData.move_paths
new_index!(MovePathIndex, INVALID_MOVE_PATH_INDEX);
/// Index into MoveData.moves.
new_index!(MoveOutIndex, INVALID_MOVE_OUT_INDEX);
/// `MovePath` is a canonicalized representation of a path that is
/// moved or assigned to.
///
@ -99,22 +109,6 @@ impl<'tcx> fmt::Debug for MovePath<'tcx> {
}
}
/// Index into MoveData.moves.
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct MoveOutIndex(usize);
impl MoveOutIndex {
pub fn idx(&self) -> Option<usize> {
if *self == INVALID_MOVE_OUT_INDEX {
None
} else {
Some(self.0)
}
}
}
const INVALID_MOVE_OUT_INDEX: MoveOutIndex = MoveOutIndex(usize::MAX);
pub struct MoveData<'tcx> {
pub move_paths: MovePathData<'tcx>,
pub moves: Vec<MoveOut>,