Skip to content

Commit 2d2ac32

Browse files
Remove unused StableMap and StableSet types from rustc_data_structures
1 parent 376a695 commit 2d2ac32

File tree

35 files changed

+35
-215
lines changed

35 files changed

+35
-215
lines changed

compiler/rustc_ast_lowering/src/asm.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use super::LoweringContext;
44

55
use rustc_ast::ptr::P;
66
use rustc_ast::*;
7-
use rustc_data_structures::fx::FxHashMap;
8-
use rustc_data_structures::stable_set::FxHashSet;
7+
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
98
use rustc_errors::struct_span_err;
109
use rustc_hir as hir;
1110
use rustc_hir::def::{DefKind, Res};

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Error reporting machinery for lifetime errors.
22
3-
use rustc_data_structures::stable_set::FxHashSet;
3+
use rustc_data_structures::fx::FxHashSet;
44
use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, MultiSpan};
55
use rustc_hir::def_id::DefId;
66
use rustc_hir::intravisit::Visitor;

compiler/rustc_codegen_gcc/src/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use gccjit::{ToLValue, ToRValue, Type};
22
use rustc_codegen_ssa::traits::{AbiBuilderMethods, BaseTypeMethods};
3-
use rustc_data_structures::stable_set::FxHashSet;
3+
use rustc_data_structures::fx::FxHashSet;
44
use rustc_middle::bug;
55
use rustc_middle::ty::Ty;
66
use rustc_target::abi::call::{CastTarget, FnAbi, PassMode, Reg, RegKind};

compiler/rustc_codegen_gcc/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use rustc_codegen_ssa::traits::{
3030
OverflowOp,
3131
StaticBuilderMethods,
3232
};
33-
use rustc_data_structures::stable_set::FxHashSet;
33+
use rustc_data_structures::fx::FxHashSet;
3434
use rustc_middle::ty::{ParamEnv, Ty, TyCtxt};
3535
use rustc_middle::ty::layout::{FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasParamEnv, HasTyCtxt, LayoutError, LayoutOfHelpers, TyAndLayout};
3636
use rustc_span::Span;

compiler/rustc_data_structures/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,10 @@ pub mod sip128;
6161
pub mod small_c_str;
6262
pub mod small_str;
6363
pub mod snapshot_map;
64-
pub mod stable_map;
6564
pub mod svh;
6665
pub use ena::snapshot_vec;
6766
pub mod memmap;
6867
pub mod sorted_map;
69-
pub mod stable_set;
7068
#[macro_use]
7169
pub mod stable_hasher;
7270
mod atomic_ref;

compiler/rustc_data_structures/src/stable_map.rs

Lines changed: 0 additions & 100 deletions
This file was deleted.

compiler/rustc_data_structures/src/stable_set.rs

Lines changed: 0 additions & 77 deletions
This file was deleted.

compiler/rustc_errors/src/diagnostic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
CodeSuggestion, DiagnosticMessage, EmissionGuarantee, Level, LintDiagnosticBuilder, MultiSpan,
44
SubdiagnosticMessage, Substitution, SubstitutionPart, SuggestionStyle,
55
};
6-
use rustc_data_structures::stable_map::FxHashMap;
6+
use rustc_data_structures::fx::FxHashMap;
77
use rustc_error_messages::FluentValue;
88
use rustc_lint_defs::{Applicability, LintExpectationId};
99
use rustc_span::edition::LATEST_STABLE_EDITION;

compiler/rustc_hir/src/pat_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::def::{CtorOf, DefKind, Res};
22
use crate::def_id::DefId;
33
use crate::hir::{self, HirId, PatKind};
4-
use rustc_data_structures::stable_set::FxHashSet;
4+
use rustc_data_structures::fx::FxHashSet;
55
use rustc_span::hygiene::DesugaringKind;
66
use rustc_span::symbol::Ident;
77
use rustc_span::Span;

compiler/rustc_incremental/src/assert_module_sources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//! was re-used.
2424
2525
use rustc_ast as ast;
26-
use rustc_data_structures::stable_set::FxHashSet;
26+
use rustc_data_structures::fx::FxHashSet;
2727
use rustc_hir::def_id::LOCAL_CRATE;
2828
use rustc_middle::mir::mono::CodegenUnitNameBuilder;
2929
use rustc_middle::ty::TyCtxt;

0 commit comments

Comments
 (0)