diff --git a/Cargo.lock b/Cargo.lock index 60988e0ff4bc1..ce3fd04faf3bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3817,6 +3817,7 @@ dependencies = [ "rustc_abi", "rustc_ast", "rustc_codegen_ssa", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_fs_util", @@ -3853,6 +3854,7 @@ dependencies = [ "rustc_arena", "rustc_ast", "rustc_attr_parsing", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_fs_util", @@ -3903,6 +3905,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "rustc_crate_store" +version = "0.0.0" +dependencies = [ + "rustc_abi", + "rustc_attr_ir", + "rustc_data_structures", + "rustc_hir_id", + "rustc_macros", + "rustc_serialize", + "rustc_span", +] + [[package]] name = "rustc_data_structures" version = "0.0.0" @@ -4091,7 +4106,6 @@ name = "rustc_hir" version = "0.0.0" dependencies = [ "bitflags", - "odht", "rustc_abi", "rustc_arena", "rustc_ast", @@ -4099,7 +4113,6 @@ dependencies = [ "rustc_data_structures", "rustc_error_messages", "rustc_errors", - "rustc_hashes", "rustc_hir_id", "rustc_index", "rustc_lint_defs", @@ -4139,11 +4152,14 @@ dependencies = [ name = "rustc_hir_id" version = "0.0.0" dependencies = [ + "odht", "rustc_data_structures", + "rustc_hashes", "rustc_index", "rustc_macros", "rustc_serialize", "rustc_span", + "tracing", ] [[package]] @@ -4253,6 +4269,7 @@ dependencies = [ "rustc_codegen_llvm", "rustc_codegen_ssa", "rustc_const_eval", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_expand", @@ -4381,6 +4398,7 @@ dependencies = [ "rustc_abi", "rustc_ast", "rustc_attr_parsing", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_expand", @@ -4414,6 +4432,7 @@ dependencies = [ "rustc_arena", "rustc_ast", "rustc_ast_ir", + "rustc_crate_store", "rustc_data_structures", "rustc_error_messages", "rustc_errors", @@ -4577,6 +4596,7 @@ dependencies = [ "rustc_ast", "rustc_ast_lowering", "rustc_attr_parsing", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_expand", @@ -4642,10 +4662,10 @@ name = "rustc_public" version = "0.1.0-preview" dependencies = [ "rustc_abi", + "rustc_crate_store", "rustc_hir", "rustc_middle", "rustc_public_bridge", - "rustc_session", "rustc_span", "rustc_target", "scoped-tls", @@ -4659,11 +4679,11 @@ name = "rustc_public_bridge" version = "0.0.0" dependencies = [ "rustc_abi", + "rustc_crate_store", "rustc_data_structures", "rustc_hir", "rustc_hir_pretty", "rustc_middle", - "rustc_session", "rustc_span", "rustc_target", ] @@ -4753,7 +4773,6 @@ dependencies = [ "rustc_feature", "rustc_fs_util", "rustc_hashes", - "rustc_hir", "rustc_lint_defs", "rustc_macros", "rustc_serialize", @@ -4855,6 +4874,7 @@ dependencies = [ "itertools", "rustc_abi", "rustc_ast", + "rustc_crate_store", "rustc_data_structures", "rustc_errors", "rustc_hir", diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index f085eba9d5307..913835a080db8 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -21,6 +21,7 @@ rustc-demangle = "0.1.28" rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_fs_util = { path = "../rustc_fs_util" } diff --git a/compiler/rustc_codegen_llvm/src/common.rs b/compiler/rustc_codegen_llvm/src/common.rs index e900bc1aecd46..3fe4550b6759e 100644 --- a/compiler/rustc_codegen_llvm/src/common.rs +++ b/compiler/rustc_codegen_llvm/src/common.rs @@ -8,6 +8,7 @@ use rustc_abi::{self as abi, ExternAbi, HasDataLayout as _}; use rustc_ast::Mutability; use rustc_codegen_ssa::common::TypeKind; use rustc_codegen_ssa::traits::*; +use rustc_crate_store::DllImport; use rustc_data_structures::stable_hash::{StableHash, StableHasher}; use rustc_hashes::Hash128; use rustc_hir::def::DefKind; @@ -15,7 +16,6 @@ use rustc_hir::def_id::DefId; use rustc_middle::bug; use rustc_middle::mir::interpret::{GlobalAlloc, PointerArithmetic, Scalar}; use rustc_middle::ty::{Instance, TyCtxt}; -use rustc_session::cstore::DllImport; use rustc_session::{PointerAuthAddressDiscriminator, PointerAuthSchema}; use tracing::debug; diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index f33d144ac5c63..d4bece718a8b9 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -16,6 +16,7 @@ rustc_abi = { path = "../rustc_abi" } rustc_arena = { path = "../rustc_arena" } rustc_ast = { path = "../rustc_ast" } rustc_attr_parsing = { path = "../rustc_attr_parsing" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_fs_util = { path = "../rustc_fs_util" } diff --git a/compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs b/compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs index f8cc07201d10f..0c9a414fd3015 100644 --- a/compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs +++ b/compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs @@ -3,13 +3,13 @@ use std::io::{BufWriter, Write}; use std::path::{Path, PathBuf}; use rustc_abi::Endian; +use rustc_crate_store::{DllImport, DllImportSymbolType}; use rustc_data_structures::base_n::{CASE_INSENSITIVE, ToBaseN}; use rustc_data_structures::fx::{FxHashMap, FxIndexMap}; use rustc_data_structures::stable_hash::StableHasher; use rustc_hashes::Hash128; use rustc_hir::attrs::NativeLibKind; use rustc_session::Session; -use rustc_session::cstore::{DllImport, DllImportSymbolType}; use rustc_span::Symbol; use rustc_target::spec::Arch; diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs index bad8600905e3e..941e9d28fc7e1 100644 --- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs +++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs @@ -2,6 +2,7 @@ use std::collections::hash_map::Entry::*; use rustc_abi::{CanonAbi, X86Call}; use rustc_ast::expand::allocator::{AllocatorKind, NO_ALLOC_SHIM_IS_UNSTABLE, global_fn_name}; +use rustc_crate_store::CrateDepKind; use rustc_data_structures::unord::UnordMap; use rustc_hir as hir; use rustc_hir::def::DefKind; @@ -17,7 +18,6 @@ use rustc_middle::ty::{ }; use rustc_middle::util::Providers; use rustc_session::config::CrateType; -use rustc_session::cstore::CrateDepKind; use rustc_span::Span; use rustc_symbol_mangling::mangle_internal_symbol; use rustc_target::spec::{Arch, Os, TlsModel}; diff --git a/compiler/rustc_codegen_ssa/src/common.rs b/compiler/rustc_codegen_ssa/src/common.rs index e9024b7dbe934..e2bbe6bf16505 100644 --- a/compiler/rustc_codegen_ssa/src/common.rs +++ b/compiler/rustc_codegen_ssa/src/common.rs @@ -1,12 +1,12 @@ #![allow(non_camel_case_types)] +use rustc_crate_store::{DllCallingConvention, DllImport, DllImportSymbolType}; use rustc_hir::attrs::PeImportNameType; use rustc_hir::attrs::lang_items::LangItem; use rustc_middle::mir::interpret::{GlobalAlloc, PointerArithmetic, Scalar}; use rustc_middle::ty::layout::TyAndLayout; use rustc_middle::ty::{self, Instance, ScalarInt, TyCtxt}; use rustc_middle::{bug, span_bug}; -use rustc_session::cstore::{DllCallingConvention, DllImport, DllImportSymbolType}; use rustc_span::Span; use rustc_target::spec::{CfgAbi, Env, Os, Target}; diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs index 02ae2d50390cc..d62c5c713f9ea 100644 --- a/compiler/rustc_codegen_ssa/src/lib.rs +++ b/compiler/rustc_codegen_ssa/src/lib.rs @@ -19,6 +19,7 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use rustc_abi::Size; +use rustc_crate_store::{self as cstore, CrateSource}; use rustc_data_structures::fx::{FxHashSet, FxIndexMap}; use rustc_data_structures::unord::{UnordMap, UnordSet}; use rustc_hir::CRATE_HIR_ID; @@ -38,7 +39,6 @@ use rustc_serialize::opaque::{FileEncoder, MemDecoder}; use rustc_serialize::{Decodable, Decoder, Encodable, Encoder}; use rustc_session::Session; use rustc_session::config::{CrateType, OutputFilenames, OutputType}; -use rustc_session::cstore::{self, CrateSource}; use rustc_session::lint::builtin::LINKER_MESSAGES; use rustc_span::{Span, Symbol}; @@ -207,7 +207,7 @@ bitflags::bitflags! { } } -// This is the same as `rustc_session::cstore::NativeLib`, except: +// This is the same as `rustc_crate_store::NativeLib`, except: // - (important) the `foreign_module` field is missing, because it contains a `DefId`, which can't // be encoded with `FileEncoder`. // - (less important) the `verbatim` field is a `bool` rather than an `Option`, because here diff --git a/compiler/rustc_crate_store/Cargo.toml b/compiler/rustc_crate_store/Cargo.toml new file mode 100644 index 0000000000000..7c84c26afe2dc --- /dev/null +++ b/compiler/rustc_crate_store/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "rustc_crate_store" +version = "0.0.0" +edition = "2024" + +[dependencies] +# tidy-alphabetical-start +rustc_abi = { path = "../rustc_abi" } +rustc_attr_ir = { path = "../rustc_attr_ir" } +rustc_data_structures = { path = "../rustc_data_structures" } +rustc_hir_id = { path = "../rustc_hir_id" } +rustc_macros = { path = "../rustc_macros" } +rustc_serialize = { path = "../rustc_serialize" } +rustc_span = { path = "../rustc_span" } +# tidy-alphabetical-end diff --git a/compiler/rustc_session/src/cstore.rs b/compiler/rustc_crate_store/src/cstore.rs similarity index 97% rename from compiler/rustc_session/src/cstore.rs rename to compiler/rustc_crate_store/src/cstore.rs index 0db1a645acafe..e3b339a5ce871 100644 --- a/compiler/rustc_session/src/cstore.rs +++ b/compiler/rustc_crate_store/src/cstore.rs @@ -8,16 +8,13 @@ use std::path::PathBuf; use rustc_abi::ExternAbi; use rustc_attr_ir::{CfgEntry, NativeLibKind, PeImportNameType}; use rustc_data_structures::sync::{self, AppendOnlyIndexVec, FreezeLock}; -// FIXME: Can we not depend on `rustc_hir` here? :) -use rustc_hir::definitions::{DefKey, DefPath, Definitions}; +use rustc_hir_id::definitions::{DefKey, DefPath, Definitions}; use rustc_macros::{BlobDecodable, Decodable, Encodable, StableHash}; use rustc_span::def_id::{ CrateNum, DefId, DefPathHash, LOCAL_CRATE, LocalDefId, StableCrateId, StableCrateIdMap, }; use rustc_span::{Span, Symbol}; -// lonely orphan structs and enums looking for a better home - /// Where a crate came from on the local filesystem. One of these three options /// must be non-None. #[derive(PartialEq, Clone, Debug, StableHash, Encodable, Decodable)] diff --git a/compiler/rustc_crate_store/src/lib.rs b/compiler/rustc_crate_store/src/lib.rs new file mode 100644 index 0000000000000..1f6684e7a2317 --- /dev/null +++ b/compiler/rustc_crate_store/src/lib.rs @@ -0,0 +1,3 @@ +mod cstore; + +pub use cstore::*; diff --git a/compiler/rustc_hir/Cargo.toml b/compiler/rustc_hir/Cargo.toml index 991093cd26914..11171fec141da 100644 --- a/compiler/rustc_hir/Cargo.toml +++ b/compiler/rustc_hir/Cargo.toml @@ -6,7 +6,6 @@ edition = "2024" [dependencies] # tidy-alphabetical-start bitflags = "2.9.1" -odht = { version = "0.3.1", features = ["nightly"] } rustc_abi = { path = "../rustc_abi" } rustc_arena = { path = "../rustc_arena" } rustc_ast = { path = "../rustc_ast" } @@ -14,7 +13,6 @@ rustc_attr_ir = { path = "../rustc_attr_ir" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_error_messages = { path = "../rustc_error_messages" } rustc_errors = { path = "../rustc_errors" } -rustc_hashes = { path = "../rustc_hashes" } rustc_hir_id = { path = "../rustc_hir_id" } rustc_index = { path = "../rustc_index" } rustc_lint_defs = { path = "../rustc_lint_defs" } diff --git a/compiler/rustc_hir/src/lib.rs b/compiler/rustc_hir/src/lib.rs index 3885e28133087..8fa3b0e83aafe 100644 --- a/compiler/rustc_hir/src/lib.rs +++ b/compiler/rustc_hir/src/lib.rs @@ -16,8 +16,6 @@ mod arena; pub mod def; -pub mod def_path_hash_map; -pub mod definitions; mod hir; pub mod intravisit; pub mod lints; @@ -25,9 +23,6 @@ pub mod pat_util; mod stable_hash_impls; mod target_impls; -#[cfg(test)] -mod tests; - #[doc(no_inline)] pub use hir::*; pub use rustc_attr_ir::{self as attrs, find_attr}; diff --git a/compiler/rustc_hir_id/Cargo.toml b/compiler/rustc_hir_id/Cargo.toml index c357a4f62d968..bfdfb3b04cd99 100644 --- a/compiler/rustc_hir_id/Cargo.toml +++ b/compiler/rustc_hir_id/Cargo.toml @@ -5,9 +5,12 @@ edition = "2024" [dependencies] # tidy-alphabetical-start +odht = { version = "0.3.1", features = ["nightly"] } rustc_data_structures = { path = "../rustc_data_structures" } +rustc_hashes = { path = "../rustc_hashes" } rustc_index = { path = "../rustc_index" } rustc_macros = { path = "../rustc_macros" } rustc_serialize = { path = "../rustc_serialize" } rustc_span = { path = "../rustc_span" } +tracing = "0.1" # tidy-alphabetical-end diff --git a/compiler/rustc_hir/src/def_path_hash_map.rs b/compiler/rustc_hir_id/src/def_path_hash_map.rs similarity index 100% rename from compiler/rustc_hir/src/def_path_hash_map.rs rename to compiler/rustc_hir_id/src/def_path_hash_map.rs diff --git a/compiler/rustc_hir/src/definitions.rs b/compiler/rustc_hir_id/src/definitions.rs similarity index 99% rename from compiler/rustc_hir/src/definitions.rs rename to compiler/rustc_hir_id/src/definitions.rs index 8b37ee2835e6c..b334efab351bc 100644 --- a/compiler/rustc_hir/src/definitions.rs +++ b/compiler/rustc_hir_id/src/definitions.rs @@ -12,12 +12,13 @@ use rustc_data_structures::stable_hash::StableHasher; use rustc_hashes::Hash64; use rustc_index::IndexVec; use rustc_macros::{BlobDecodable, Decodable, Encodable, extension}; -use rustc_span::def_id::LocalDefIdMap; +pub use rustc_span::def_id::DefPathHash; +use rustc_span::def_id::{ + CRATE_DEF_INDEX, CrateNum, DefIndex, LOCAL_CRATE, LocalDefId, LocalDefIdMap, StableCrateId, +}; use rustc_span::{Symbol, kw, sym}; use tracing::{debug, instrument}; -pub use crate::def_id::DefPathHash; -use crate::def_id::{CRATE_DEF_INDEX, CrateNum, DefIndex, LOCAL_CRATE, LocalDefId, StableCrateId}; use crate::def_path_hash_map::DefPathHashMap; #[derive(Debug, Default, Clone)] diff --git a/compiler/rustc_hir_id/src/lib.rs b/compiler/rustc_hir_id/src/lib.rs index 07b1cceebaf76..dce7e7fd31a36 100644 --- a/compiler/rustc_hir_id/src/lib.rs +++ b/compiler/rustc_hir_id/src/lib.rs @@ -4,6 +4,12 @@ #![feature(negative_impls)] #![feature(rustc_attrs)] +pub mod def_path_hash_map; +pub mod definitions; + +#[cfg(test)] +mod tests; + use std::fmt::{self, Debug}; use rustc_data_structures::stable_hash::{ diff --git a/compiler/rustc_hir/src/tests.rs b/compiler/rustc_hir_id/src/tests.rs similarity index 100% rename from compiler/rustc_hir/src/tests.rs rename to compiler/rustc_hir_id/src/tests.rs diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml index 4a272867046b4..f2b3e79c72119 100644 --- a/compiler/rustc_interface/Cargo.toml +++ b/compiler/rustc_interface/Cargo.toml @@ -16,6 +16,7 @@ rustc_builtin_macros = { path = "../rustc_builtin_macros" } rustc_codegen_llvm = { path = "../rustc_codegen_llvm", optional = true } rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } rustc_const_eval = { path = "../rustc_const_eval" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_expand = { path = "../rustc_expand" } diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index cdba198297201..a2f6792d408fe 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -9,6 +9,7 @@ use rustc_ast as ast; use rustc_attr_parsing::{AttributeParser, ShouldEmit}; use rustc_codegen_ssa::traits::CodegenBackend; use rustc_codegen_ssa::{CompiledModules, CrateInfo}; +use rustc_crate_store::Untracked; use rustc_data_structures::indexmap::IndexMap; use rustc_data_structures::steal::Steal; use rustc_data_structures::sync::{ @@ -36,7 +37,6 @@ use rustc_parse::{new_parser_from_file, new_parser_from_source_str, unwrap_or_em use rustc_passes::{abi_test, input_stats, layout_test}; use rustc_resolve::{Resolver, ResolverOutputs}; use rustc_session::config::{CrateType, Input, OutFileName, OutputFilenames, OutputType}; -use rustc_session::cstore::Untracked; use rustc_session::diagnostics::feature_err; use rustc_session::output::{filename_for_input, invalid_output_for_target}; use rustc_session::search_paths::PathKind; diff --git a/compiler/rustc_metadata/Cargo.toml b/compiler/rustc_metadata/Cargo.toml index 2fce131e08b6a..c079a42b0fa22 100644 --- a/compiler/rustc_metadata/Cargo.toml +++ b/compiler/rustc_metadata/Cargo.toml @@ -11,6 +11,7 @@ odht = { version = "0.3.1", features = ["nightly"] } rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } rustc_attr_parsing = { path = "../rustc_attr_parsing" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_expand = { path = "../rustc_expand" } diff --git a/compiler/rustc_metadata/src/creader.rs b/compiler/rustc_metadata/src/creader.rs index 8879c175da2f9..6543b5700192e 100644 --- a/compiler/rustc_metadata/src/creader.rs +++ b/compiler/rustc_metadata/src/creader.rs @@ -7,6 +7,7 @@ use std::{cmp, env, iter}; use rustc_ast::expand::allocator::{ALLOC_ERROR_HANDLER, AllocatorKind, global_fn_name}; use rustc_ast::{self as ast, *}; +use rustc_crate_store::{CrateDepKind, CrateSource, ExternCrate, ExternCrateSource}; use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::owned_slice::OwnedSlice; use rustc_data_structures::svh::Svh; @@ -26,7 +27,6 @@ use rustc_session::config::{ CrateType, ExtendedTargetModifierInfo, ExternLocation, Externs, OptionsTargetModifiers, TargetModifier, }; -use rustc_session::cstore::{CrateDepKind, CrateSource, ExternCrate, ExternCrateSource}; use rustc_session::output::validate_crate_name; use rustc_session::search_paths::PathKind; use rustc_session::{Session, lint}; diff --git a/compiler/rustc_metadata/src/dependency_format.rs b/compiler/rustc_metadata/src/dependency_format.rs index 257b2a9b03884..6460e20ce211b 100644 --- a/compiler/rustc_metadata/src/dependency_format.rs +++ b/compiler/rustc_metadata/src/dependency_format.rs @@ -51,6 +51,8 @@ //! Additionally, the algorithm is geared towards finding *any* solution rather //! than finding a number of solutions (there are normally quite a few). +use rustc_crate_store::CrateDepKind; +use rustc_crate_store::LinkagePreference::{self, RequireDynamic, RequireStatic}; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_hir::def_id::{CrateNum, LOCAL_CRATE}; use rustc_index::IndexVec; @@ -58,8 +60,6 @@ use rustc_middle::bug; use rustc_middle::middle::dependency_format::{Dependencies, DependencyList, Linkage}; use rustc_middle::ty::TyCtxt; use rustc_session::config::CrateType; -use rustc_session::cstore::CrateDepKind; -use rustc_session::cstore::LinkagePreference::{self, RequireDynamic, RequireStatic}; use rustc_span::sym; use rustc_target::spec::PanicStrategy; use tracing::info; diff --git a/compiler/rustc_metadata/src/foreign_modules.rs b/compiler/rustc_metadata/src/foreign_modules.rs index 8a6b2027083d6..0b73656f779dd 100644 --- a/compiler/rustc_metadata/src/foreign_modules.rs +++ b/compiler/rustc_metadata/src/foreign_modules.rs @@ -1,10 +1,10 @@ +use rustc_crate_store::ForeignModule; use rustc_data_structures::fx::FxIndexMap; use rustc_hir as hir; use rustc_hir::def::DefKind; use rustc_hir::def_id::DefId; use rustc_middle::query::LocalCrate; use rustc_middle::ty::TyCtxt; -use rustc_session::cstore::ForeignModule; pub(crate) fn collect(tcx: TyCtxt<'_>, LocalCrate: LocalCrate) -> FxIndexMap { let mut modules = FxIndexMap::default(); diff --git a/compiler/rustc_metadata/src/locator.rs b/compiler/rustc_metadata/src/locator.rs index f26b27399b958..687776386e36e 100644 --- a/compiler/rustc_metadata/src/locator.rs +++ b/compiler/rustc_metadata/src/locator.rs @@ -218,6 +218,7 @@ use std::ops::Deref; use std::path::{Path, PathBuf}; use std::{cmp, fmt}; +use rustc_crate_store::CrateSource; use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet}; use rustc_data_structures::memmap::Mmap; use rustc_data_structures::owned_slice::{OwnedSlice, slice_owned}; @@ -225,7 +226,6 @@ use rustc_data_structures::svh::Svh; use rustc_errors::{DiagArgValue, IntoDiagArg}; use rustc_fs_util::try_canonicalize; use rustc_proc_macro::bridge::client::Client as ProcMacroClient; -use rustc_session::cstore::CrateSource; use rustc_session::filesearch::FileSearch; use rustc_session::search_paths::PathKind; use rustc_session::utils::CanonicalizedPath; diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs index 1c0d8d2affe6a..138bb55847255 100644 --- a/compiler/rustc_metadata/src/native_libs.rs +++ b/compiler/rustc_metadata/src/native_libs.rs @@ -1,5 +1,8 @@ use rustc_abi::ExternAbi; use rustc_attr_parsing::eval_config_entry; +use rustc_crate_store::{ + DllCallingConvention, DllImport, DllImportSymbolType, ForeignModule, NativeLib, +}; use rustc_data_structures::fx::FxHashSet; use rustc_hir::attrs::{NativeLibKind, PeImportNameType}; use rustc_hir::def::DefKind; @@ -9,9 +12,6 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags; use rustc_middle::query::LocalCrate; use rustc_middle::ty::{self, List, Ty, TyCtxt}; use rustc_session::Session; -use rustc_session::cstore::{ - DllCallingConvention, DllImport, DllImportSymbolType, ForeignModule, NativeLib, -}; use rustc_span::Symbol; use rustc_span::def_id::{DefId, LOCAL_CRATE}; use rustc_target::spec::{Arch, BinaryFormat, CfgAbi}; diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs index 3a7cffb5989fc..f4d3380594c9f 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder.rs @@ -8,6 +8,7 @@ use std::{io, mem}; pub(super) use cstore_impl::provide; use rustc_ast as ast; +use rustc_crate_store::{CrateSource, ExternCrate}; use rustc_data_structures::fingerprint::Fingerprint; use rustc_data_structures::fx::FxIndexMap; use rustc_data_structures::owned_slice::OwnedSlice; @@ -32,7 +33,6 @@ use rustc_serialize::opaque::MemDecoder; use rustc_serialize::{Decodable, Decoder}; use rustc_session::config::TargetModifier; use rustc_session::config::mitigation_coverage::DeniedPartialMitigation; -use rustc_session::cstore::{CrateSource, ExternCrate}; use rustc_span::def_id::ModId; use rustc_span::hygiene::HygieneDecodeContext; use rustc_span::{ diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs index 3f73b14fb85ee..8fe1d6561d135 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs @@ -2,6 +2,7 @@ use std::any::Any; use std::mem; use std::sync::Arc; +use rustc_crate_store::{CrateStore, ExternCrate}; use rustc_data_structures::fx::FxHashMap; use rustc_hir::attrs::Deprecation; use rustc_hir::def::{CtorKind, DefKind}; @@ -19,7 +20,6 @@ use rustc_middle::ty::{self, TyCtxt, TypeVisitable}; use rustc_middle::util::Providers; use rustc_serialize::Decoder; use rustc_session::StableCrateId; -use rustc_session::cstore::{CrateStore, ExternCrate}; use rustc_span::def_id::ModId; use rustc_span::hygiene::ExpnId; use rustc_span::{Span, Symbol, kw}; diff --git a/compiler/rustc_metadata/src/rmeta/mod.rs b/compiler/rustc_metadata/src/rmeta/mod.rs index 3273013466245..064d906293ae8 100644 --- a/compiler/rustc_metadata/src/rmeta/mod.rs +++ b/compiler/rustc_metadata/src/rmeta/mod.rs @@ -9,6 +9,7 @@ pub use encoder::{EncodedMetadata, encode_metadata, rendered_const}; pub(crate) use parameterized::ParameterizedOverTcx; use rustc_abi::{FieldIdx, ReprOptions, VariantIdx}; use rustc_ast as ast; +use rustc_crate_store::{CrateDepKind, ForeignModule, LinkagePreference, NativeLib}; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::svh::Svh; use rustc_hir as hir; @@ -38,7 +39,6 @@ use rustc_middle::util::Providers; use rustc_serialize::opaque::FileEncoder; use rustc_session::config::mitigation_coverage::DeniedPartialMitigation; use rustc_session::config::{SymbolManglingVersion, TargetModifier}; -use rustc_session::cstore::{CrateDepKind, ForeignModule, LinkagePreference, NativeLib}; use rustc_span::edition::Edition; use rustc_span::hygiene::{ExpnIndex, MacroKind, SyntaxContextKey}; use rustc_span::{self, ExpnData, ExpnHash, ExpnId, Ident, Span, Symbol}; diff --git a/compiler/rustc_metadata/src/rmeta/parameterized.rs b/compiler/rustc_metadata/src/rmeta/parameterized.rs index 75b86f8dda274..f19737bb936be 100644 --- a/compiler/rustc_metadata/src/rmeta/parameterized.rs +++ b/compiler/rustc_metadata/src/rmeta/parameterized.rs @@ -85,6 +85,9 @@ trivially_parameterized_over_tcx! { crate::rmeta::VariantData, rustc_abi::ReprOptions, rustc_ast::DelimArgs, + rustc_crate_store::ForeignModule, + rustc_crate_store::LinkagePreference, + rustc_crate_store::NativeLib, rustc_hir::Attribute, rustc_hir::ConstStability, rustc_hir::Constness, @@ -132,9 +135,6 @@ trivially_parameterized_over_tcx! { rustc_middle::ty::fast_reject::SimplifiedType, rustc_session::config::TargetModifier, rustc_session::config::mitigation_coverage::DeniedPartialMitigation, - rustc_session::cstore::ForeignModule, - rustc_session::cstore::LinkagePreference, - rustc_session::cstore::NativeLib, rustc_span::ExpnData, rustc_span::ExpnHash, rustc_span::ExpnId, diff --git a/compiler/rustc_middle/Cargo.toml b/compiler/rustc_middle/Cargo.toml index 55608083d3751..2d4b3ced37fd1 100644 --- a/compiler/rustc_middle/Cargo.toml +++ b/compiler/rustc_middle/Cargo.toml @@ -15,6 +15,7 @@ rustc_apfloat = "0.2.0" rustc_arena = { path = "../rustc_arena" } rustc_ast = { path = "../rustc_ast" } rustc_ast_ir = { path = "../rustc_ast_ir" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_error_messages = { path = "../rustc_error_messages" } # Used for intra-doc links rustc_errors = { path = "../rustc_errors" } diff --git a/compiler/rustc_middle/src/ich.rs b/compiler/rustc_middle/src/ich.rs index 80db9a95c918a..1577e54a45bf7 100644 --- a/compiler/rustc_middle/src/ich.rs +++ b/compiler/rustc_middle/src/ich.rs @@ -1,11 +1,11 @@ use std::hash::Hash; +use rustc_crate_store::Untracked; use rustc_data_structures::stable_hash::{ RawDefId, RawDefPathHash, RawSpan, StableHash, StableHashControls, StableHashCtxt, StableHasher, }; use rustc_hir::def_id::{DefId, LocalDefId}; use rustc_session::Session; -use rustc_session::cstore::Untracked; use rustc_span::source_map::SourceMap; use rustc_span::{CachingSourceMapView, DUMMY_SP, Pos, Span}; diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs index ca1cd2f45975f..38071962b439d 100644 --- a/compiler/rustc_middle/src/queries.rs +++ b/compiler/rustc_middle/src/queries.rs @@ -53,6 +53,9 @@ use rustc_arena::TypedArena; use rustc_ast as ast; use rustc_ast::expand::allocator::AllocatorKind; use rustc_ast::tokenstream::TokenStream; +use rustc_crate_store::{ + CrateDepKind, CrateSource, ExternCrate, ForeignModule, LinkagePreference, NativeLib, +}; use rustc_data_structures::fx::{FxIndexMap, FxIndexSet}; use rustc_data_structures::sorted_map::SortedMap; use rustc_data_structures::steal::Steal; @@ -70,9 +73,6 @@ use rustc_lint_defs::LintId; use rustc_macros::rustc_queries; use rustc_session::Limits; use rustc_session::config::{EntryFnType, OptLevel, OutputFilenames, SymbolManglingVersion}; -use rustc_session::cstore::{ - CrateDepKind, CrateSource, ExternCrate, ForeignModule, LinkagePreference, NativeLib, -}; use rustc_session::lint::StableLintExpectationId; use rustc_span::def_id::{LOCAL_CRATE, ModId}; use rustc_span::{DUMMY_SP, LocalExpnId, Span, Spanned, Symbol}; diff --git a/compiler/rustc_middle/src/query/erase.rs b/compiler/rustc_middle/src/query/erase.rs index 9a6ab2732953a..7dcd364bde8bf 100644 --- a/compiler/rustc_middle/src/query/erase.rs +++ b/compiler/rustc_middle/src/query/erase.rs @@ -215,6 +215,7 @@ impl_erasable_for_types_with_no_type_params! { Result, traits::query::NoSolution>, Ty<'_>, bool, + rustc_crate_store::CrateDepKind, rustc_data_structures::svh::Svh, rustc_hir::Constness, rustc_hir::Defaultness, @@ -252,7 +253,6 @@ impl_erasable_for_types_with_no_type_params! { rustc_session::Limits, rustc_session::config::OptLevel, rustc_session::config::SymbolManglingVersion, - rustc_session::cstore::CrateDepKind, rustc_span::ExpnId, rustc_span::Span, rustc_span::Symbol, diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 136a9e6ca464e..75aa5aaaa4352 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -17,6 +17,7 @@ use std::{fmt, iter, mem}; use rustc_abi::{ExternAbi, FieldIdx, Layout, LayoutData, TargetDataLayout, VariantIdx}; use rustc_ast as ast; +use rustc_crate_store::{CrateStoreDyn, Untracked}; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::intern::Interned; use rustc_data_structures::profiling::SelfProfilerRef; @@ -37,7 +38,6 @@ use rustc_hir::{self as hir, CRATE_HIR_ID, HirId, Node, TraitCandidate, find_att use rustc_index::IndexVec; use rustc_macros::Diagnostic; use rustc_session::config::CrateType; -use rustc_session::cstore::{CrateStoreDyn, Untracked}; use rustc_session::lint::Lint; use rustc_session::{IncrCompSession, Session}; use rustc_span::def_id::{CRATE_DEF_ID, DefPathHash, StableCrateId}; diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs index 7fdfd8479b401..4ab474fd89fe6 100644 --- a/compiler/rustc_middle/src/ty/print/pretty.rs +++ b/compiler/rustc_middle/src/ty/print/pretty.rs @@ -6,6 +6,7 @@ use std::ops::{Deref, DerefMut}; use rustc_abi::{ExternAbi, Size}; use rustc_apfloat::Float; use rustc_apfloat::ieee::{Double, Half, Quad, Single}; +use rustc_crate_store::{ExternCrate, ExternCrateSource}; use rustc_data_structures::Limit; use rustc_data_structures::fx::{FxIndexMap, IndexEntry}; use rustc_data_structures::unord::UnordMap; @@ -15,7 +16,6 @@ use rustc_hir::def::{self, CtorKind, DefKind, Namespace}; use rustc_hir::def_id::{DefIdMap, DefIdSet, LOCAL_CRATE, ModId}; use rustc_hir::definitions::{DefKey, DefPathDataName}; use rustc_macros::{Lift, extension}; -use rustc_session::cstore::{ExternCrate, ExternCrateSource}; use rustc_span::{Ident, RemapPathScopeComponents, Symbol, kw, sym}; use rustc_type_ir::{FieldInfo, Unnormalized, Upcast as _, elaborate}; use smallvec::SmallVec; diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs index fa4850599369c..adf153b68dae6 100644 --- a/compiler/rustc_middle/src/ty/util.rs +++ b/compiler/rustc_middle/src/ty/util.rs @@ -866,7 +866,7 @@ impl<'tcx> TyCtxt<'tcx> { /// be shown in `impl` suggestions. /// /// [public]: TyCtxt::is_private_dep - /// [direct]: rustc_session::cstore::ExternCrate::is_direct + /// [direct]: rustc_crate_store::ExternCrate::is_direct pub fn is_user_visible_dep(self, key: CrateNum) -> bool { // `#![rustc_private]` overrides defaults to make private dependencies usable. if self.features().enabled(sym::rustc_private) { diff --git a/compiler/rustc_passes/Cargo.toml b/compiler/rustc_passes/Cargo.toml index b65a0ad404a53..7319aadf29ae2 100644 --- a/compiler/rustc_passes/Cargo.toml +++ b/compiler/rustc_passes/Cargo.toml @@ -9,6 +9,7 @@ rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } rustc_ast_lowering = { path = "../rustc_ast_lowering" } rustc_attr_parsing = { path = "../rustc_attr_parsing" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_expand = { path = "../rustc_expand" } diff --git a/compiler/rustc_passes/src/lang_items.rs b/compiler/rustc_passes/src/lang_items.rs index d26069b07b854..86a57a4d36121 100644 --- a/compiler/rustc_passes/src/lang_items.rs +++ b/compiler/rustc_passes/src/lang_items.rs @@ -9,12 +9,12 @@ use rustc_ast as ast; use rustc_ast::visit; +use rustc_crate_store::ExternCrate; use rustc_hir::Target; use rustc_hir::attrs::lang_items::{GenericRequirement, LangItem, LanguageItems}; use rustc_hir::def_id::{DefId, LocalDefId}; use rustc_middle::query::Providers; use rustc_middle::ty::{ResolverAstLowering, TyCtxt}; -use rustc_session::cstore::ExternCrate; use rustc_span::{Span, Symbol, sym}; use crate::diagnostics::{DuplicateLangItem, IncorrectCrateType, IncorrectTarget}; diff --git a/compiler/rustc_public/Cargo.toml b/compiler/rustc_public/Cargo.toml index c2b00b515adc6..95bbfd554df19 100644 --- a/compiler/rustc_public/Cargo.toml +++ b/compiler/rustc_public/Cargo.toml @@ -6,10 +6,10 @@ edition = "2024" [dependencies] # tidy-alphabetical-start rustc_abi = { path = "../rustc_abi" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_hir = { path = "../rustc_hir" } rustc_middle = { path = "../rustc_middle" } rustc_public_bridge = { path = "../rustc_public_bridge" } -rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } scoped-tls = "1.0" diff --git a/compiler/rustc_public/src/unstable/convert/stable/ty.rs b/compiler/rustc_public/src/unstable/convert/stable/ty.rs index 54e11aca7da77..160487400c38c 100644 --- a/compiler/rustc_public/src/unstable/convert/stable/ty.rs +++ b/compiler/rustc_public/src/unstable/convert/stable/ty.rs @@ -1047,7 +1047,7 @@ impl<'tcx> Stable<'tcx> for rustc_abi::ExternAbi { } } -impl<'tcx> Stable<'tcx> for rustc_session::cstore::ForeignModule { +impl<'tcx> Stable<'tcx> for rustc_crate_store::ForeignModule { type T = crate::ty::ForeignModule; fn stable<'cx>( diff --git a/compiler/rustc_public_bridge/Cargo.toml b/compiler/rustc_public_bridge/Cargo.toml index 918de4a393cff..d131f217cc617 100644 --- a/compiler/rustc_public_bridge/Cargo.toml +++ b/compiler/rustc_public_bridge/Cargo.toml @@ -6,11 +6,11 @@ edition = "2024" [dependencies] # tidy-alphabetical-start rustc_abi = { path = "../rustc_abi" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_hir = { path = "../rustc_hir" } rustc_hir_pretty = { path = "../rustc_hir_pretty" } rustc_middle = { path = "../rustc_middle" } -rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } # tidy-alphabetical-end diff --git a/compiler/rustc_public_bridge/src/context/impls.rs b/compiler/rustc_public_bridge/src/context/impls.rs index 345e83ca21b69..70e2498ac350b 100644 --- a/compiler/rustc_public_bridge/src/context/impls.rs +++ b/compiler/rustc_public_bridge/src/context/impls.rs @@ -5,6 +5,7 @@ use std::iter; use rustc_abi::{Endian, Layout, ReprOptions}; +use rustc_crate_store::ForeignModule; use rustc_hir::Attribute; use rustc_hir::attrs::lang_items::LangItem; use rustc_hir::def::DefKind; @@ -22,7 +23,6 @@ use rustc_middle::ty::{ ValTree, VariantDef, VtblEntry, }; use rustc_middle::{mir, ty}; -use rustc_session::cstore::ForeignModule; use rustc_span::def_id::{CrateNum, DefId, LOCAL_CRATE}; use rustc_span::{Span, Symbol}; use rustc_target::callconv::FnAbi; diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml index f70a7069b0d93..c230c6793f0c2 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml @@ -14,7 +14,6 @@ rustc_errors = { path = "../rustc_errors" } rustc_feature = { path = "../rustc_feature" } rustc_fs_util = { path = "../rustc_fs_util" } rustc_hashes = { path = "../rustc_hashes" } -rustc_hir = { path = "../rustc_hir" } rustc_lint_defs = { path = "../rustc_lint_defs" } rustc_macros = { path = "../rustc_macros" } rustc_serialize = { path = "../rustc_serialize" } diff --git a/compiler/rustc_session/src/lib.rs b/compiler/rustc_session/src/lib.rs index 94566c943d7ed..a2f6f7b39fe91 100644 --- a/compiler/rustc_session/src/lib.rs +++ b/compiler/rustc_session/src/lib.rs @@ -24,7 +24,6 @@ pub mod parse; pub mod utils; #[macro_use] pub mod config; -pub mod cstore; pub mod filesearch; mod macros; mod options; diff --git a/compiler/rustc_trait_selection/Cargo.toml b/compiler/rustc_trait_selection/Cargo.toml index ae231c217977d..d29dbb45fa45c 100644 --- a/compiler/rustc_trait_selection/Cargo.toml +++ b/compiler/rustc_trait_selection/Cargo.toml @@ -8,6 +8,7 @@ edition = "2024" itertools = "0.15" rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } +rustc_crate_store = { path = "../rustc_crate_store" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_hir = { path = "../rustc_hir" } diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs index 24b7e93320f9c..76b4900367bde 100644 --- a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs +++ b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs @@ -7,6 +7,7 @@ pub mod suggestions; use std::{fmt, iter}; +use rustc_crate_store::{ExternCrate, ExternCrateSource}; use rustc_data_structures::fx::{FxIndexMap, FxIndexSet}; use rustc_data_structures::unord::UnordSet; use rustc_errors::{Applicability, Diag, E0038, E0276, MultiSpan, struct_span_code_err}; @@ -20,7 +21,6 @@ use rustc_infer::traits::{ }; use rustc_middle::ty::print::{PrintTraitRefExt as _, with_no_trimmed_paths}; use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt as _}; -use rustc_session::cstore::{ExternCrate, ExternCrateSource}; use rustc_span::{DesugaringKind, ErrorGuaranteed, ExpnKind, Span}; use thin_vec::ThinVec; use tracing::{info, instrument}; diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap index 165e270270702..755c0e19b8ae1 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap @@ -37,6 +37,7 @@ expression: bench - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiler.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiler.snap index a350c9a92c74b..924972d28e607 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiler.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiler.snap @@ -19,6 +19,7 @@ expression: build compiler - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap index 5c15debc2edb7..46e00afd325d1 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check.snap @@ -21,6 +21,7 @@ expression: check - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiler.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiler.snap index 2ee6f90f68f8c..eb48e337aeb0e 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiler.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiler.snap @@ -21,6 +21,7 @@ expression: check compiler - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap index 677e45333169b..c84a6aed4eba8 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_check_compiletest_include_default_paths.snap @@ -21,6 +21,7 @@ expression: check compiletest --include-default-paths - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_clippy.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_clippy.snap index f1430e020aaa4..99db9ae7b0268 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_clippy.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_clippy.snap @@ -36,6 +36,7 @@ expression: clippy - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap index 28f6053d4c100..529073c5b5a55 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_fix.snap @@ -21,6 +21,7 @@ expression: fix - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap index 59b84f4301feb..7807566751a2f 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap @@ -85,6 +85,7 @@ expression: test - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap index 29dc8ee5efcfc..7bac4c859c450 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap @@ -82,6 +82,7 @@ expression: test --skip=coverage - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap index 9240e939f946f..732b84e90a880 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap @@ -85,6 +85,7 @@ expression: test --skip=coverage-map - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap index f30be2939765a..c36a9fd752aed 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap @@ -85,6 +85,7 @@ expression: test --skip=coverage-run - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap index f1aa131eb7c3a..bf5de019af6f4 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap @@ -46,6 +46,7 @@ expression: test --skip=tests - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap index ddf45bcfdbdb1..3236872a46469 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap @@ -82,6 +82,7 @@ expression: test --skip=tests/coverage - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap index c38962f9c12b0..93d3ee139e3fb 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap @@ -30,6 +30,7 @@ expression: test --skip=tests --skip=library --skip=tidyselftest - Set({compiler/rustc_codegen_llvm}) - Set({compiler/rustc_codegen_ssa}) - Set({compiler/rustc_const_eval}) + - Set({compiler/rustc_crate_store}) - Set({compiler/rustc_data_structures}) - Set({compiler/rustc_driver}) - Set({compiler/rustc_driver_impl}) diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 3c0eb8e332030..4ae1ee53537f2 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -1691,7 +1691,7 @@ mod snapshot { insta::assert_snapshot!( ctx.config("check") .path("compiler") - .render_steps(), @"[check] rustc 0 -> rustc 1 (75 crates)"); + .render_steps(), @"[check] rustc 0 -> rustc 1 (76 crates)"); } #[test] @@ -1717,7 +1717,7 @@ mod snapshot { ctx.config("check") .path("compiler") .stage(1) - .render_steps(), @"[check] rustc 0 -> rustc 1 (75 crates)"); + .render_steps(), @"[check] rustc 0 -> rustc 1 (76 crates)"); } #[test] @@ -1731,7 +1731,7 @@ mod snapshot { [build] llvm [build] rustc 0 -> rustc 1 [build] rustc 1 -> std 1 - [check] rustc 1 -> rustc 2 (75 crates) + [check] rustc 1 -> rustc 2 (76 crates) "); } @@ -1747,7 +1747,7 @@ mod snapshot { [build] rustc 0 -> rustc 1 [build] rustc 1 -> std 1 [check] rustc 1 -> std 1 - [check] rustc 1 -> rustc 2 (75 crates) + [check] rustc 1 -> rustc 2 (76 crates) [check] rustc 1 -> rustc 2 [check] rustc 1 -> Rustdoc 2 [check] rustc 1 -> rustc_codegen_cranelift 2 @@ -1844,7 +1844,7 @@ mod snapshot { ctx.config("check") .paths(&["library", "compiler"]) .args(&args) - .render_steps(), @"[check] rustc 0 -> rustc 1 (75 crates)"); + .render_steps(), @"[check] rustc 0 -> rustc 1 (76 crates)"); } #[test] @@ -3055,7 +3055,7 @@ mod snapshot { let ctx = TestCtx::new(); insta::assert_snapshot!(ctx.config("fix").path("compiler").render_steps(), @r" [build] llvm - [fix] rustc 0 -> rustc 1 (75 crates) + [fix] rustc 0 -> rustc 1 (76 crates) "); } }