diff --git a/crates/resolver-tests/src/lib.rs b/crates/resolver-tests/src/lib.rs index acf5235a8231..abb5ae13f45f 100644 --- a/crates/resolver-tests/src/lib.rs +++ b/crates/resolver-tests/src/lib.rs @@ -12,9 +12,9 @@ use std::time::Instant; use cargo::core::dependency::DepKind; use cargo::core::resolver::{self, ResolveOpts, VersionPreferences}; -use cargo::core::source::{GitReference, SourceId}; use cargo::core::Resolve; use cargo::core::{Dependency, PackageId, Registry, Summary}; +use cargo::core::{GitReference, SourceId}; use cargo::sources::source::QueryKind; use cargo::util::{CargoResult, Config, Graph, IntoUrl}; diff --git a/src/cargo/core/mod.rs b/src/cargo/core/mod.rs index b8a27604f9f8..9b56564a7c9d 100644 --- a/src/cargo/core/mod.rs +++ b/src/cargo/core/mod.rs @@ -8,7 +8,7 @@ pub use self::package_id_spec::PackageIdSpec; pub use self::registry::Registry; pub use self::resolver::{Resolve, ResolveVersion}; pub use self::shell::{Shell, Verbosity}; -pub use self::source::{GitReference, SourceId}; +pub use self::source_id::{GitReference, SourceId}; pub use self::summary::{FeatureMap, FeatureValue, Summary}; pub use self::workspace::{ find_workspace_root, resolve_relative_path, MaybePackage, Workspace, WorkspaceConfig, @@ -27,6 +27,6 @@ pub mod profiles; pub mod registry; pub mod resolver; pub mod shell; -pub mod source; +mod source_id; pub mod summary; mod workspace; diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index e17a73e68052..d1bcb448e6f8 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -10,7 +10,7 @@ use std::sync::OnceLock; use serde::de; use serde::ser; -use crate::core::source::SourceId; +use crate::core::SourceId; use crate::util::interning::InternedString; use crate::util::{CargoResult, ToSemver}; @@ -238,7 +238,7 @@ impl fmt::Debug for PackageId { #[cfg(test)] mod tests { use super::PackageId; - use crate::core::source::SourceId; + use crate::core::SourceId; use crate::sources::CRATES_IO_INDEX; use crate::util::IntoUrl; diff --git a/src/cargo/core/source/mod.rs b/src/cargo/core/source/mod.rs deleted file mode 100644 index 3a2f6f6015bd..000000000000 --- a/src/cargo/core/source/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod source_id; - -pub use self::source_id::{GitReference, SourceId}; diff --git a/src/cargo/core/source/source_id.rs b/src/cargo/core/source_id.rs similarity index 99% rename from src/cargo/core/source/source_id.rs rename to src/cargo/core/source_id.rs index 9501fdc31ba7..c38401b52307 100644 --- a/src/cargo/core/source/source_id.rs +++ b/src/cargo/core/source_id.rs @@ -31,7 +31,7 @@ static SOURCE_ID_CACHE: OnceLock>> = OnceL /// /// [`Source`]: crate::sources::source::Source /// [`Source::source_id`]: crate::sources::source::Source::source_id -/// [`PackageId`]: super::super::PackageId +/// [`PackageId`]: super::PackageId #[derive(Clone, Copy, Eq, Debug)] pub struct SourceId { inner: &'static SourceIdInner, diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index f39829bd036d..1cdcf9840ec2 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -1,7 +1,7 @@ //! See [GitSource]. -use crate::core::source::SourceId; use crate::core::GitReference; +use crate::core::SourceId; use crate::core::{Dependency, Package, PackageId, Summary}; use crate::sources::git::utils::GitRemote; use crate::sources::source::MaybePackage; diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index 26104e7e7163..37a609e8fc48 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -427,7 +427,7 @@ fn named_config_profile() { let ws = Workspace::new(&paths::root().join("Cargo.toml"), &config).unwrap(); let profiles = Profiles::new(&ws, profile_name).unwrap(); - let crates_io = cargo::core::source::SourceId::crates_io(&config).unwrap(); + let crates_io = cargo::core::SourceId::crates_io(&config).unwrap(); let a_pkg = PackageId::new("a", "0.1.0", crates_io).unwrap(); let dep_pkg = PackageId::new("dep", "0.1.0", crates_io).unwrap();