diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-30 08:58:14 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-01 06:50:40 -0600 |
| commit | 9bc4fbb10a1517c2ac5a4c9b0ae3ac6559c90a0d (patch) | |
| tree | 60a31a751d69a5f8b87177f77d2cd1b261f63299 /src/librustc | |
| parent | 1d64b241cdca1477cc4c87b3751326212ebf78f6 (diff) | |
| download | rust-9bc4fbb10a1517c2ac5a4c9b0ae3ac6559c90a0d.tar.gz rust-9bc4fbb10a1517c2ac5a4c9b0ae3ac6559c90a0d.zip | |
Split out growth functionality into BitVector type
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/mir/traversal.rs | 10 | ||||
| -rw-r--r-- | src/librustc/traits/select.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc/mir/traversal.rs b/src/librustc/mir/traversal.rs index 86fd825850f..c178a9063c9 100644 --- a/src/librustc/mir/traversal.rs +++ b/src/librustc/mir/traversal.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use rustc_data_structures::bitvec::BitVector; +use rustc_data_structures::bitvec::BitArray; use super::*; @@ -32,7 +32,7 @@ use super::*; #[derive(Clone)] pub struct Preorder<'a, 'tcx: 'a> { mir: &'a Mir<'tcx>, - visited: BitVector<BasicBlock>, + visited: BitArray<BasicBlock>, worklist: Vec<BasicBlock>, } @@ -42,7 +42,7 @@ impl<'a, 'tcx> Preorder<'a, 'tcx> { Preorder { mir, - visited: BitVector::new(mir.basic_blocks().len()), + visited: BitArray::new(mir.basic_blocks().len()), worklist, } } @@ -104,7 +104,7 @@ impl<'a, 'tcx> ExactSizeIterator for Preorder<'a, 'tcx> {} /// A Postorder traversal of this graph is `D B C A` or `D C B A` pub struct Postorder<'a, 'tcx: 'a> { mir: &'a Mir<'tcx>, - visited: BitVector<BasicBlock>, + visited: BitArray<BasicBlock>, visit_stack: Vec<(BasicBlock, Successors<'a>)> } @@ -112,7 +112,7 @@ impl<'a, 'tcx> Postorder<'a, 'tcx> { pub fn new(mir: &'a Mir<'tcx>, root: BasicBlock) -> Postorder<'a, 'tcx> { let mut po = Postorder { mir, - visited: BitVector::new(mir.basic_blocks().len()), + visited: BitArray::new(mir.basic_blocks().len()), visit_stack: Vec::new() }; diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index 40171345f55..35184ca6a25 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.rs @@ -45,7 +45,7 @@ use middle::lang_items; use mir::interpret::{GlobalId}; use rustc_data_structures::sync::Lock; -use rustc_data_structures::bitvec::BitVector; +use rustc_data_structures::bitvec::BitArray; use std::iter; use std::cmp; use std::fmt; @@ -3056,7 +3056,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> { } else { return Err(Unimplemented); }; - let mut ty_params = BitVector::new(substs_a.types().count()); + let mut ty_params = BitArray::new(substs_a.types().count()); let mut found = false; for ty in field.walk() { if let ty::TyParam(p) = ty.sty { |
