diff options
| author | bors <bors@rust-lang.org> | 2018-08-23 02:54:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-23 02:54:24 +0000 |
| commit | e73077e10603b3586828f2d3d067f804c2fc0a1f (patch) | |
| tree | 9d65dd4a735a543507f8640063e2713523d33e2e /src/librustc | |
| parent | 917945d662c42053383fe3e71cb0f313d585e459 (diff) | |
| parent | e7e9f2e6997ae12573cf4726935f232bf13fb40b (diff) | |
| download | rust-e73077e10603b3586828f2d3d067f804c2fc0a1f.tar.gz rust-e73077e10603b3586828f2d3d067f804c2fc0a1f.zip | |
Auto merge of #53520 - nnethercote:merge-IdxSet-IdxSetBuf, r=nikomatsakis
Merge `IdxSet` and `IdxSetBuf` Because it simplifies things. @r? nikomatsakis
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/ty/query/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs index c1372293a1b..6f61583e49b 100644 --- a/src/librustc/ty/query/mod.rs +++ b/src/librustc/ty/query/mod.rs @@ -49,7 +49,7 @@ use util::nodemap::{DefIdSet, DefIdMap, ItemLocalSet}; use util::common::{ErrorReported}; use util::profiling::ProfileCategory::*; -use rustc_data_structures::indexed_set::IdxSetBuf; +use rustc_data_structures::indexed_set::IdxSet; use rustc_target::spec::PanicStrategy; use rustc_data_structures::indexed_vec::IndexVec; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; @@ -208,7 +208,7 @@ define_queries! { <'tcx> /// Maps DefId's that have an associated Mir to the result /// of the MIR qualify_consts pass. The actual meaning of /// the value isn't known except to the pass itself. - [] fn mir_const_qualif: MirConstQualif(DefId) -> (u8, Lrc<IdxSetBuf<mir::Local>>), + [] fn mir_const_qualif: MirConstQualif(DefId) -> (u8, Lrc<IdxSet<mir::Local>>), /// Fetch the MIR for a given def-id right after it's built - this includes /// unreachable code. |