Rollup merge of #36991 - wesleywiser:fixme_1, r=arielb1
Move IdxSetBuf and BitSlice to rustc_data_structures Resolves a FIXME
This commit is contained in:
commit
d13b102c54
|
@ -12,6 +12,8 @@
|
|||
|
||||
use syntax::ast::NodeId;
|
||||
use rustc::mir::repr::{BasicBlock, Mir};
|
||||
use rustc_data_structures::bitslice::bits_to_string;
|
||||
use rustc_data_structures::indexed_set::{IdxSet};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
|
||||
use dot;
|
||||
|
@ -27,8 +29,6 @@ use std::path::Path;
|
|||
|
||||
use super::super::MoveDataParamEnv;
|
||||
use super::super::MirBorrowckCtxtPreDataflow;
|
||||
use bitslice::bits_to_string;
|
||||
use indexed_set::{IdxSet};
|
||||
use super::{BitDenotation, DataflowState};
|
||||
|
||||
impl<O: BitDenotation> DataflowState<O> {
|
||||
|
|
|
@ -10,6 +10,9 @@
|
|||
|
||||
use rustc::ty::TyCtxt;
|
||||
use rustc::mir::repr::{self, Mir, Location};
|
||||
use rustc_data_structures::bitslice::BitSlice; // adds set_bit/get_bit to &[usize] bitvector rep.
|
||||
use rustc_data_structures::bitslice::{BitwiseOperator};
|
||||
use rustc_data_structures::indexed_set::{IdxSet};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
|
||||
use super::super::gather_moves::{MoveOutIndex, MovePathIndex};
|
||||
|
@ -21,10 +24,6 @@ use super::super::on_lookup_result_bits;
|
|||
|
||||
use super::{BitDenotation, BlockSets, DataflowOperator};
|
||||
|
||||
use bitslice::BitSlice; // adds set_bit/get_bit to &[usize] bitvector rep.
|
||||
use bitslice::{BitwiseOperator};
|
||||
use indexed_set::{IdxSet};
|
||||
|
||||
// Dataflow analyses are built upon some interpretation of the
|
||||
// bitvectors attached to each basic block, represented via a
|
||||
// zero-sized structure.
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use rustc_data_structures::indexed_set::{IdxSet, IdxSetBuf};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_data_structures::bitslice::{bitwise, BitwiseOperator};
|
||||
|
||||
use rustc::ty::TyCtxt;
|
||||
use rustc::mir::repr::{self, Mir};
|
||||
|
@ -22,9 +24,6 @@ use std::usize;
|
|||
use super::MirBorrowckCtxtPreDataflow;
|
||||
use super::MoveDataParamEnv;
|
||||
|
||||
use bitslice::{bitwise, BitwiseOperator};
|
||||
use indexed_set::{IdxSet, IdxSetBuf};
|
||||
|
||||
pub use self::sanity_check::sanity_check_via_rustc_peek;
|
||||
pub use self::impls::{MaybeInitializedLvals, MaybeUninitializedLvals};
|
||||
pub use self::impls::{DefinitelyInitializedLvals, MovingOutStatements};
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use indexed_set::IdxSetBuf;
|
||||
use super::gather_moves::{MoveData, MovePathIndex, LookupResult};
|
||||
use super::dataflow::{MaybeInitializedLvals, MaybeUninitializedLvals};
|
||||
use super::dataflow::{DataflowResults};
|
||||
|
@ -23,6 +22,7 @@ use rustc::mir::transform::{Pass, MirPass, MirSource};
|
|||
use rustc::middle::const_val::ConstVal;
|
||||
use rustc::middle::lang_items;
|
||||
use rustc::util::nodemap::FnvHashMap;
|
||||
use rustc_data_structures::indexed_set::IdxSetBuf;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use syntax_pos::Span;
|
||||
|
||||
|
|
|
@ -50,8 +50,6 @@ pub use borrowck::{AnalysisData, BorrowckCtxt, ElaborateDrops};
|
|||
pub mod diagnostics;
|
||||
|
||||
mod borrowck;
|
||||
mod bitslice;
|
||||
mod indexed_set;
|
||||
|
||||
pub mod graphviz;
|
||||
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// FIXME: move this to `rustc_data_structures` and potentially merge
|
||||
// with `bitvec` there.
|
||||
// FIXME: merge with `bitvec`
|
||||
|
||||
use std::mem;
|
||||
|
|
@ -8,16 +8,13 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// FIXME: move this to `rustc_data_structures`
|
||||
|
||||
use std::fmt;
|
||||
use std::marker::PhantomData;
|
||||
use std::mem;
|
||||
use std::ops::{Deref, DerefMut, Range};
|
||||
use bitslice::{BitSlice, Word};
|
||||
use bitslice::{bitwise, Union, Subtract};
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use indexed_vec::Idx;
|
||||
|
||||
/// Represents a set (or packed family of sets), of some element type
|
||||
/// E, where each E is identified by some unique index type `T`.
|
|
@ -41,9 +41,11 @@ extern crate serialize as rustc_serialize; // used by deriving
|
|||
#[cfg(unix)]
|
||||
extern crate libc;
|
||||
|
||||
pub mod bitslice;
|
||||
pub mod bitvec;
|
||||
pub mod graph;
|
||||
pub mod ivar;
|
||||
pub mod indexed_set;
|
||||
pub mod indexed_vec;
|
||||
pub mod obligation_forest;
|
||||
pub mod snapshot_map;
|
||||
|
|
Loading…
Reference in New Issue