diff --git a/src/cargo/core/compiler/build_config.rs b/src/cargo/core/compiler/build_config.rs index a05c6e3b7a5..d981c3604fc 100644 --- a/src/cargo/core/compiler/build_config.rs +++ b/src/cargo/core/compiler/build_config.rs @@ -1,5 +1,5 @@ use crate::core::compiler::CompileKind; -use crate::core::interning::InternedString; +use crate::util::interning::InternedString; use crate::util::ProcessBuilder; use crate::util::{CargoResult, Config, RustfixDiagnosticServer}; use anyhow::bail; diff --git a/src/cargo/core/compiler/build_context/mod.rs b/src/cargo/core/compiler/build_context/mod.rs index ac7d6eca295..47efdc77de8 100644 --- a/src/cargo/core/compiler/build_context/mod.rs +++ b/src/cargo/core/compiler/build_context/mod.rs @@ -2,9 +2,10 @@ use crate::core::compiler::unit_graph::UnitGraph; use crate::core::compiler::{BuildConfig, CompileKind, Unit}; use crate::core::profiles::Profiles; use crate::core::PackageSet; -use crate::core::{InternedString, Workspace}; +use crate::core::Workspace; use crate::util::config::Config; use crate::util::errors::CargoResult; +use crate::util::interning::InternedString; use crate::util::Rustc; use std::collections::HashMap; use std::path::PathBuf; diff --git a/src/cargo/core/compiler/compile_kind.rs b/src/cargo/core/compiler/compile_kind.rs index e2089d969bd..a621d8ce7f7 100644 --- a/src/cargo/core/compiler/compile_kind.rs +++ b/src/cargo/core/compiler/compile_kind.rs @@ -1,5 +1,6 @@ -use crate::core::{InternedString, Target}; +use crate::core::Target; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::Config; use anyhow::bail; use serde::Serialize; diff --git a/src/cargo/core/compiler/fingerprint.rs b/src/cargo/core/compiler/fingerprint.rs index 4adab7efbcf..ded419acbae 100644 --- a/src/cargo/core/compiler/fingerprint.rs +++ b/src/cargo/core/compiler/fingerprint.rs @@ -323,9 +323,10 @@ use serde::ser; use serde::{Deserialize, Serialize}; use crate::core::compiler::unit_graph::UnitDep; -use crate::core::{InternedString, Package}; +use crate::core::Package; use crate::util; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::{internal, profile}; diff --git a/src/cargo/core/compiler/lto.rs b/src/cargo/core/compiler/lto.rs index 6d776e87215..5c401e82a1d 100644 --- a/src/cargo/core/compiler/lto.rs +++ b/src/cargo/core/compiler/lto.rs @@ -1,6 +1,6 @@ use crate::core::compiler::{CompileMode, Context, CrateType, Unit}; -use crate::core::interning::InternedString; use crate::core::profiles; +use crate::util::interning::InternedString; use crate::util::errors::CargoResult; use std::collections::hash_map::{Entry, HashMap}; diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index dd2a3c5da20..fc9a897b2d1 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -49,8 +49,9 @@ use self::unit_graph::UnitDep; pub use crate::core::compiler::unit::{Unit, UnitInterner}; use crate::core::manifest::TargetSourcePath; use crate::core::profiles::{PanicStrategy, Profile, Strip}; -use crate::core::{Edition, Feature, InternedString, PackageId, Target}; +use crate::core::{Edition, Feature, PackageId, Target}; use crate::util::errors::{self, CargoResult, CargoResultExt, ProcessError, VerboseError}; +use crate::util::interning::InternedString; use crate::util::machine_message::Message; use crate::util::{self, machine_message, ProcessBuilder}; use crate::util::{internal, join_paths, paths, profile}; diff --git a/src/cargo/core/compiler/unit.rs b/src/cargo/core/compiler/unit.rs index a7f80321d41..b4422f50474 100644 --- a/src/cargo/core/compiler/unit.rs +++ b/src/cargo/core/compiler/unit.rs @@ -1,7 +1,8 @@ use crate::core::compiler::{CompileKind, CompileMode, CrateType}; use crate::core::manifest::{Target, TargetKind}; -use crate::core::{profiles::Profile, InternedString, Package}; +use crate::core::{profiles::Profile, Package}; use crate::util::hex::short_hash; +use crate::util::interning::InternedString; use crate::util::Config; use std::cell::RefCell; use std::collections::HashSet; diff --git a/src/cargo/core/compiler/unit_dependencies.rs b/src/cargo/core/compiler/unit_dependencies.rs index 542bc8c985d..5bd8c0aff87 100644 --- a/src/cargo/core/compiler/unit_dependencies.rs +++ b/src/cargo/core/compiler/unit_dependencies.rs @@ -22,8 +22,9 @@ use crate::core::dependency::DepKind; use crate::core::profiles::{Profile, Profiles, UnitFor}; use crate::core::resolver::features::{FeaturesFor, ResolvedFeatures}; use crate::core::resolver::Resolve; -use crate::core::{InternedString, Package, PackageId, PackageSet, Target, Workspace}; +use crate::core::{Package, PackageId, PackageSet, Target, Workspace}; use crate::ops::resolve_all_features; +use crate::util::interning::InternedString; use crate::util::Config; use crate::CargoResult; use log::trace; diff --git a/src/cargo/core/compiler/unit_graph.rs b/src/cargo/core/compiler/unit_graph.rs index d242f6b0497..243a32a6ae2 100644 --- a/src/cargo/core/compiler/unit_graph.rs +++ b/src/cargo/core/compiler/unit_graph.rs @@ -1,7 +1,8 @@ use crate::core::compiler::Unit; use crate::core::compiler::{CompileKind, CompileMode}; use crate::core::profiles::{Profile, UnitFor}; -use crate::core::{nightly_features_allowed, InternedString, PackageId, Target}; +use crate::core::{nightly_features_allowed, PackageId, Target}; +use crate::util::interning::InternedString; use crate::util::CargoResult; use std::collections::HashMap; use std::io::Write; diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index 4ca071447b8..2d586b5dfa1 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -6,9 +6,9 @@ use serde::ser; use serde::Serialize; use std::rc::Rc; -use crate::core::interning::InternedString; use crate::core::{PackageId, SourceId, Summary}; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::Config; /// Information about a dependency requested by a Cargo manifest. diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index 6978081a6fa..008cec3b79c 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -11,11 +11,11 @@ use serde::Serialize; use url::Url; use crate::core::compiler::CrateType; -use crate::core::interning::InternedString; use crate::core::resolver::ResolveBehavior; use crate::core::{Dependency, PackageId, PackageIdSpec, SourceId, Summary}; use crate::core::{Edition, Feature, Features, WorkspaceConfig}; use crate::util::errors::*; +use crate::util::interning::InternedString; use crate::util::toml::{TomlManifest, TomlProfiles}; use crate::util::{short_hash, Config, Filesystem}; diff --git a/src/cargo/core/mod.rs b/src/cargo/core/mod.rs index 3d664d153b7..5abab1b9cd4 100644 --- a/src/cargo/core/mod.rs +++ b/src/cargo/core/mod.rs @@ -3,7 +3,6 @@ pub use self::features::{ enable_nightly_features, maybe_allow_nightly_features, nightly_features_allowed, }; pub use self::features::{CliUnstable, Edition, Feature, Features}; -pub use self::interning::InternedString; pub use self::manifest::{EitherManifest, VirtualManifest}; pub use self::manifest::{Manifest, Target, TargetKind}; pub use self::package::{Package, PackageSet}; @@ -19,7 +18,6 @@ pub use self::workspace::{Members, Workspace, WorkspaceConfig, WorkspaceRootConf pub mod compiler; pub mod dependency; pub mod features; -mod interning; pub mod manifest; pub mod package; pub mod package_id; diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index 8acb87097de..1187def1db4 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -20,7 +20,6 @@ use serde::Serialize; use crate::core::compiler::{CompileKind, RustcTargetData}; use crate::core::dependency::DepKind; -use crate::core::interning::InternedString; use crate::core::resolver::{HasDevUnits, Resolve}; use crate::core::source::MaybePackage; use crate::core::{Dependency, Manifest, PackageId, SourceId, Target}; @@ -28,6 +27,7 @@ use crate::core::{FeatureMap, SourceMap, Summary, Workspace}; use crate::ops; use crate::util::config::PackageCacheLock; use crate::util::errors::{CargoResult, CargoResultExt, HttpNot200}; +use crate::util::interning::InternedString; use crate::util::network::Retry; use crate::util::{self, internal, Config, Progress, ProgressStyle}; diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index 088a4d98d79..5764f97c776 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -9,8 +9,8 @@ use std::sync::Mutex; use serde::de; use serde::ser; -use crate::core::interning::InternedString; use crate::core::source::SourceId; +use crate::util::interning::InternedString; use crate::util::{CargoResult, ToSemver}; lazy_static::lazy_static! { diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs index ff70bfae3b1..57a2db61436 100644 --- a/src/cargo/core/package_id_spec.rs +++ b/src/cargo/core/package_id_spec.rs @@ -5,9 +5,9 @@ use semver::Version; use serde::{de, ser}; use url::Url; -use crate::core::interning::InternedString; use crate::core::PackageId; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::{validate_package_name, IntoUrl, ToSemver}; /// Some or all of the data required to identify a package: @@ -274,8 +274,8 @@ impl<'de> de::Deserialize<'de> for PackageIdSpec { #[cfg(test)] mod tests { use super::PackageIdSpec; - use crate::core::interning::InternedString; use crate::core::{PackageId, SourceId}; + use crate::util::interning::InternedString; use crate::util::ToSemver; use url::Url; diff --git a/src/cargo/core/profiles.rs b/src/cargo/core/profiles.rs index 7d97576c2da..6a28bd2610f 100644 --- a/src/cargo/core/profiles.rs +++ b/src/cargo/core/profiles.rs @@ -1,8 +1,8 @@ use crate::core::compiler::CompileMode; -use crate::core::interning::InternedString; use crate::core::resolver::features::FeaturesFor; use crate::core::{Feature, Features, PackageId, PackageIdSpec, Resolve, Shell}; use crate::util::errors::CargoResultExt; +use crate::util::interning::InternedString; use crate::util::toml::{ProfilePackageSpec, StringOrBool, TomlProfile, TomlProfiles, U32OrBool}; use crate::util::{closest_msg, config, CargoResult, Config}; use anyhow::bail; diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 160ca770ad7..d8b784d1db0 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -5,10 +5,11 @@ use log::{debug, trace}; use semver::VersionReq; use url::Url; +use crate::core::PackageSet; use crate::core::{Dependency, PackageId, Source, SourceId, SourceMap, Summary}; -use crate::core::{InternedString, PackageSet}; use crate::sources::config::SourceConfigMap; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::{profile, CanonicalUrl, Config}; /// Source of information about a group of packages. diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs index 7924f8cb07f..95f4a9fe663 100644 --- a/src/cargo/core/resolver/context.rs +++ b/src/cargo/core/resolver/context.rs @@ -4,8 +4,8 @@ use std::num::NonZeroU64; use anyhow::format_err; use log::debug; -use crate::core::interning::InternedString; use crate::core::{Dependency, PackageId, SourceId, Summary}; +use crate::util::interning::InternedString; use crate::util::Graph; use super::dep_cache::RegistryQueryer; diff --git a/src/cargo/core/resolver/dep_cache.rs b/src/cargo/core/resolver/dep_cache.rs index c23629d7157..b9d681fd401 100644 --- a/src/cargo/core/resolver/dep_cache.rs +++ b/src/cargo/core/resolver/dep_cache.rs @@ -15,11 +15,11 @@ use std::rc::Rc; use log::debug; -use crate::core::interning::InternedString; use crate::core::resolver::context::Context; use crate::core::resolver::errors::describe_path; use crate::core::{Dependency, FeatureValue, PackageId, PackageIdSpec, Registry, Summary}; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::core::resolver::types::{ConflictReason, DepInfo, FeaturesSet}; use crate::core::resolver::{ActivateResult, ResolveOpts}; diff --git a/src/cargo/core/resolver/encode.rs b/src/cargo/core/resolver/encode.rs index 4d711498235..7b30c470a6b 100644 --- a/src/cargo/core/resolver/encode.rs +++ b/src/cargo/core/resolver/encode.rs @@ -98,9 +98,9 @@ use serde::de; use serde::ser; use serde::{Deserialize, Serialize}; -use crate::core::InternedString; use crate::core::{Dependency, Package, PackageId, SourceId, Workspace}; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::{internal, Graph}; use super::{Resolve, ResolveVersion}; diff --git a/src/cargo/core/resolver/features.rs b/src/cargo/core/resolver/features.rs index a2c25cb95c6..026f0af51f3 100644 --- a/src/cargo/core/resolver/features.rs +++ b/src/cargo/core/resolver/features.rs @@ -42,7 +42,8 @@ use crate::core::compiler::{CompileKind, RustcTargetData}; use crate::core::dependency::{DepKind, Dependency}; use crate::core::resolver::types::FeaturesSet; use crate::core::resolver::{Resolve, ResolveBehavior}; -use crate::core::{FeatureValue, InternedString, PackageId, PackageIdSpec, PackageSet, Workspace}; +use crate::core::{FeatureValue, PackageId, PackageIdSpec, PackageSet, Workspace}; +use crate::util::interning::InternedString; use crate::util::CargoResult; use std::collections::{BTreeSet, HashMap, HashSet}; use std::rc::Rc; diff --git a/src/cargo/core/resolver/resolve.rs b/src/cargo/core/resolver/resolve.rs index 80904299f79..c0bb53c7d9f 100644 --- a/src/cargo/core/resolver/resolve.rs +++ b/src/cargo/core/resolver/resolve.rs @@ -1,8 +1,8 @@ use super::encode::Metadata; use crate::core::dependency::DepKind; -use crate::core::interning::InternedString; use crate::core::{Dependency, PackageId, PackageIdSpec, Summary, Target}; use crate::util::errors::CargoResult; +use crate::util::interning::InternedString; use crate::util::Graph; use std::borrow::Borrow; use std::cmp; diff --git a/src/cargo/core/resolver/types.rs b/src/cargo/core/resolver/types.rs index ab988a8523e..dabe8c094e1 100644 --- a/src/cargo/core/resolver/types.rs +++ b/src/cargo/core/resolver/types.rs @@ -1,7 +1,7 @@ use super::features::RequestedFeatures; -use crate::core::interning::InternedString; use crate::core::{Dependency, PackageId, Summary}; use crate::util::errors::CargoResult; +use crate::util::interning::InternedString; use crate::util::Config; use std::cmp::Ordering; use std::collections::{BTreeMap, BTreeSet}; diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index 0efdc477fe2..70774577a8a 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -7,8 +7,8 @@ use std::rc::Rc; use serde::{Serialize, Serializer}; -use crate::core::interning::InternedString; use crate::core::{Dependency, PackageId, SourceId}; +use crate::util::interning::InternedString; use semver::Version; use crate::util::CargoResult; diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index db4b655c464..ccde5b9ecce 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -13,11 +13,12 @@ use crate::core::features::Features; use crate::core::registry::PackageRegistry; use crate::core::resolver::features::RequestedFeatures; use crate::core::resolver::ResolveBehavior; -use crate::core::{Dependency, InternedString, PackageId, PackageIdSpec}; +use crate::core::{Dependency, PackageId, PackageIdSpec}; use crate::core::{EitherManifest, Package, SourceId, VirtualManifest}; use crate::ops; use crate::sources::PathSource; use crate::util::errors::{CargoResult, CargoResultExt, ManifestError}; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::toml::{read_manifest, TomlProfiles}; use crate::util::{Config, Filesystem}; diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index d4bc8ce5295..5efa976f04d 100644 --- a/src/cargo/ops/cargo_clean.rs +++ b/src/cargo/ops/cargo_clean.rs @@ -1,8 +1,9 @@ use crate::core::compiler::{CompileKind, CompileMode, Layout, RustcTargetData}; use crate::core::profiles::Profiles; -use crate::core::{InternedString, PackageIdSpec, TargetKind, Workspace}; +use crate::core::{PackageIdSpec, TargetKind, Workspace}; use crate::ops; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::Config; use std::fs; diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs index 56def031247..d4ea0fde70e 100644 --- a/src/cargo/ops/cargo_output_metadata.rs +++ b/src/cargo/ops/cargo_output_metadata.rs @@ -1,8 +1,9 @@ use crate::core::compiler::{CompileKind, RustcTargetData}; use crate::core::dependency::DepKind; use crate::core::resolver::{HasDevUnits, Resolve, ResolveOpts}; -use crate::core::{Dependency, InternedString, Package, PackageId, Workspace}; +use crate::core::{Dependency, Package, PackageId, Workspace}; use crate::ops::{self, Packages}; +use crate::util::interning::InternedString; use crate::util::CargoResult; use cargo_platform::Platform; use serde::Serialize; diff --git a/src/cargo/ops/tree/graph.rs b/src/cargo/ops/tree/graph.rs index 5698cf04beb..363199a218b 100644 --- a/src/cargo/ops/tree/graph.rs +++ b/src/cargo/ops/tree/graph.rs @@ -5,9 +5,8 @@ use crate::core::compiler::{CompileKind, RustcTargetData}; use crate::core::dependency::DepKind; use crate::core::resolver::features::{FeaturesFor, RequestedFeatures, ResolvedFeatures}; use crate::core::resolver::Resolve; -use crate::core::{ - FeatureMap, FeatureValue, InternedString, Package, PackageId, PackageIdSpec, Workspace, -}; +use crate::core::{FeatureMap, FeatureValue, Package, PackageId, PackageIdSpec, Workspace}; +use crate::util::interning::InternedString; use crate::util::CargoResult; use std::collections::{HashMap, HashSet}; diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs index 9743ccfe349..3b9a16d6542 100644 --- a/src/cargo/sources/registry/index.rs +++ b/src/cargo/sources/registry/index.rs @@ -67,8 +67,9 @@ //! hopefully those are more obvious inline in the code itself. use crate::core::dependency::Dependency; -use crate::core::{InternedString, PackageId, SourceId, Summary}; +use crate::core::{PackageId, SourceId, Summary}; use crate::sources::registry::{RegistryData, RegistryPackage}; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::{internal, CargoResult, Config, Filesystem, ToSemver}; use log::info; diff --git a/src/cargo/sources/registry/local.rs b/src/cargo/sources/registry/local.rs index d9c1221b04c..d35345eb86c 100644 --- a/src/cargo/sources/registry/local.rs +++ b/src/cargo/sources/registry/local.rs @@ -1,6 +1,7 @@ -use crate::core::{InternedString, PackageId}; +use crate::core::PackageId; use crate::sources::registry::{MaybeLock, RegistryConfig, RegistryData}; use crate::util::errors::CargoResult; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::{Config, Filesystem, Sha256}; use std::fs::File; diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index 44328b29fbd..c9ab7ff4ecd 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -173,10 +173,11 @@ use tar::Archive; use crate::core::dependency::{DepKind, Dependency}; use crate::core::source::MaybePackage; -use crate::core::{InternedString, Package, PackageId, Source, SourceId, Summary}; +use crate::core::{Package, PackageId, Source, SourceId, Summary}; use crate::sources::PathSource; use crate::util::errors::CargoResultExt; use crate::util::hex; +use crate::util::interning::InternedString; use crate::util::into_url::IntoUrl; use crate::util::{restricted_names, CargoResult, Config, Filesystem}; diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs index 9c610ae82ab..a96c2bbf258 100644 --- a/src/cargo/sources/registry/remote.rs +++ b/src/cargo/sources/registry/remote.rs @@ -1,4 +1,4 @@ -use crate::core::{GitReference, InternedString, PackageId, SourceId}; +use crate::core::{GitReference, PackageId, SourceId}; use crate::sources::git; use crate::sources::registry::MaybeLock; use crate::sources::registry::{ @@ -6,6 +6,7 @@ use crate::sources::registry::{ VERSION_TEMPLATE, }; use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::{Config, Filesystem, Sha256}; use lazycell::LazyCell; diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index 60df3de3bfe..a0b2e0ed6be 100644 --- a/src/cargo/util/command_prelude.rs +++ b/src/cargo/util/command_prelude.rs @@ -1,9 +1,9 @@ use crate::core::compiler::{BuildConfig, MessageFormat}; -use crate::core::InternedString; use crate::core::Workspace; use crate::ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl}; use crate::sources::CRATES_IO_REGISTRY; use crate::util::important_paths::find_root_manifest_for_wd; +use crate::util::interning::InternedString; use crate::util::{paths, toml::TomlProfile, validate_package_name}; use crate::util::{ print_available_benches, print_available_binaries, print_available_examples, diff --git a/src/cargo/core/interning.rs b/src/cargo/util/interning.rs similarity index 99% rename from src/cargo/core/interning.rs rename to src/cargo/util/interning.rs index 942869ac70b..bbec1294269 100644 --- a/src/cargo/core/interning.rs +++ b/src/cargo/util/interning.rs @@ -11,7 +11,7 @@ use std::ptr; use std::str; use std::sync::Mutex; -pub fn leak(s: String) -> &'static str { +fn leak(s: String) -> &'static str { Box::leak(s.into_boxed_str()) } diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 7f2ba2697e4..8bed0b91633 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -43,6 +43,7 @@ pub mod graph; mod hasher; pub mod hex; pub mod important_paths; +pub mod interning; pub mod into_url; mod into_url_with_base; pub mod job; diff --git a/src/cargo/util/rustc.rs b/src/cargo/util/rustc.rs index 2ab08fec6cc..aa713818563 100644 --- a/src/cargo/util/rustc.rs +++ b/src/cargo/util/rustc.rs @@ -7,7 +7,7 @@ use std::sync::Mutex; use log::{debug, info, warn}; use serde::{Deserialize, Serialize}; -use crate::core::InternedString; +use crate::util::interning::InternedString; use crate::util::paths; use crate::util::{self, profile, CargoResult, CargoResultExt, ProcessBuilder, StableHasher}; diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index e01052b666b..6dc4a409801 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -17,11 +17,12 @@ use crate::core::dependency::DepKind; use crate::core::manifest::{ManifestMetadata, TargetSourcePath, Warnings}; use crate::core::profiles::Strip; use crate::core::resolver::ResolveBehavior; -use crate::core::{Dependency, InternedString, Manifest, PackageId, Summary, Target}; +use crate::core::{Dependency, Manifest, PackageId, Summary, Target}; use crate::core::{Edition, EitherManifest, Feature, Features, VirtualManifest, Workspace}; use crate::core::{GitReference, PackageIdSpec, SourceId, WorkspaceConfig, WorkspaceRootConfig}; use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY}; use crate::util::errors::{CargoResult, CargoResultExt, ManifestError}; +use crate::util::interning::InternedString; use crate::util::{self, paths, validate_package_name, Config, IntoUrl}; mod targets; diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs index 4cbea32f54a..5771440e9da 100644 --- a/tests/testsuite/config.rs +++ b/tests/testsuite/config.rs @@ -1,7 +1,8 @@ //! Tests for config settings. -use cargo::core::{enable_nightly_features, InternedString, Shell}; +use cargo::core::{enable_nightly_features, Shell}; use cargo::util::config::{self, Config, SslVersionConfig, StringList}; +use cargo::util::interning::InternedString; use cargo::util::toml::{self, VecStringOrBool as VSOB}; use cargo::CargoResult; use cargo_test_support::{normalized_lines_match, paths, project, t}; diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index 12d0693a076..a1dc5c35b19 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -346,7 +346,8 @@ fn named_config_profile() { use cargo::core::enable_nightly_features; use cargo::core::features::Features; use cargo::core::profiles::{Profiles, UnitFor}; - use cargo::core::{InternedString, PackageId}; + use cargo::core::PackageId; + use cargo::util::interning::InternedString; use cargo::util::toml::TomlProfiles; use std::fs; enable_nightly_features();