Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/base-db/src/input.rs')
| -rw-r--r-- | crates/base-db/src/input.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs index 564697facf..2fe4f688f5 100644 --- a/crates/base-db/src/input.rs +++ b/crates/base-db/src/input.rs @@ -89,7 +89,7 @@ impl ops::Index<CrateBuilderId> for CrateGraphBuilder { pub struct CrateBuilder { pub basic: CrateDataBuilder, pub extra: ExtraCrateData, - pub cfg_options: Arc<CfgOptions>, + pub cfg_options: CfgOptions, pub env: Env, ws_data: Arc<CrateWorkspaceData>, } @@ -311,6 +311,7 @@ pub struct CrateData<Id> { pub type CrateDataBuilder = CrateData<CrateBuilderId>; pub type BuiltCrateData = CrateData<Crate>; +/// Crate data unrelated to analysis. #[derive(Debug, Clone, PartialEq, Eq)] pub struct ExtraCrateData { pub version: Option<String>, @@ -402,9 +403,8 @@ pub struct Crate { // This is in `Arc` because it is shared for all crates in a workspace. #[return_ref] pub workspace_data: Arc<CrateWorkspaceData>, - // FIXME: Remove this `Arc`. #[return_ref] - pub cfg_options: Arc<CfgOptions>, + pub cfg_options: CfgOptions, #[return_ref] pub env: Env, } @@ -420,7 +420,7 @@ impl CrateGraphBuilder { edition: Edition, display_name: Option<CrateDisplayName>, version: Option<String>, - cfg_options: Arc<CfgOptions>, + cfg_options: CfgOptions, potential_cfg_options: Option<CfgOptions>, mut env: Env, origin: CrateOrigin, @@ -601,12 +601,6 @@ impl CrateGraphBuilder { self.arena.iter().map(|(idx, _)| idx) } - // FIXME: used for fixing up the toolchain sysroot, should be removed and done differently - #[doc(hidden)] - pub fn iter_mut(&mut self) -> impl Iterator<Item = (CrateBuilderId, &mut CrateBuilder)> + '_ { - self.arena.iter_mut() - } - /// Returns an iterator over all transitive dependencies of the given crate, /// including the crate itself. pub fn transitive_deps(&self, of: CrateBuilderId) -> impl Iterator<Item = CrateBuilderId> { |