Skip to content

Commit e575448

Browse files
committed
refactor: flatten module path of SourceId
1 parent b6c4e47 commit e575448

File tree

7 files changed

+8
-11
lines changed

7 files changed

+8
-11
lines changed

crates/resolver-tests/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use std::time::Instant;
1313

1414
use cargo::core::dependency::DepKind;
1515
use cargo::core::resolver::{self, ResolveOpts, VersionPreferences};
16-
use cargo::core::source::{GitReference, SourceId};
1716
use cargo::core::Resolve;
1817
use cargo::core::{Dependency, PackageId, Registry, Summary};
18+
use cargo::core::{GitReference, SourceId};
1919
use cargo::sources::source::QueryKind;
2020
use cargo::util::{CargoResult, Config, Graph, IntoUrl, PartialVersion};
2121

src/cargo/core/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub use self::package_id_spec::PackageIdSpec;
88
pub use self::registry::Registry;
99
pub use self::resolver::{Resolve, ResolveVersion};
1010
pub use self::shell::{Shell, Verbosity};
11-
pub use self::source::{GitReference, SourceId};
11+
pub use self::source_id::{GitReference, SourceId};
1212
pub use self::summary::{FeatureMap, FeatureValue, Summary};
1313
pub use self::workspace::{
1414
find_workspace_root, resolve_relative_path, MaybePackage, Workspace, WorkspaceConfig,
@@ -27,6 +27,6 @@ pub mod profiles;
2727
pub mod registry;
2828
pub mod resolver;
2929
pub mod shell;
30-
pub mod source;
30+
mod source_id;
3131
pub mod summary;
3232
mod workspace;

src/cargo/core/package_id.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::sync::OnceLock;
1010
use serde::de;
1111
use serde::ser;
1212

13-
use crate::core::source::SourceId;
13+
use crate::core::SourceId;
1414
use crate::util::interning::InternedString;
1515
use crate::util::{CargoResult, ToSemver};
1616

@@ -238,7 +238,7 @@ impl fmt::Debug for PackageId {
238238
#[cfg(test)]
239239
mod tests {
240240
use super::PackageId;
241-
use crate::core::source::SourceId;
241+
use crate::core::SourceId;
242242
use crate::sources::CRATES_IO_INDEX;
243243
use crate::util::IntoUrl;
244244

src/cargo/core/source/mod.rs

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

src/cargo/core/source/source_id.rs renamed to src/cargo/core/source_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static SOURCE_ID_CACHE: OnceLock<Mutex<HashSet<&'static SourceIdInner>>> = OnceL
3232
///
3333
/// [`Source`]: crate::sources::source::Source
3434
/// [`Source::source_id`]: crate::sources::source::Source::source_id
35-
/// [`PackageId`]: super::super::PackageId
35+
/// [`PackageId`]: super::PackageId
3636
#[derive(Clone, Copy, Eq, Debug)]
3737
pub struct SourceId {
3838
inner: &'static SourceIdInner,

src/cargo/sources/git/source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! See [GitSource].
22
3-
use crate::core::source::SourceId;
43
use crate::core::GitReference;
4+
use crate::core::SourceId;
55
use crate::core::{Dependency, Package, PackageId, Summary};
66
use crate::sources::git::utils::GitRemote;
77
use crate::sources::source::MaybePackage;

tests/testsuite/profile_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ fn named_config_profile() {
427427
let ws = Workspace::new(&paths::root().join("Cargo.toml"), &config).unwrap();
428428
let profiles = Profiles::new(&ws, profile_name).unwrap();
429429

430-
let crates_io = cargo::core::source::SourceId::crates_io(&config).unwrap();
430+
let crates_io = cargo::core::SourceId::crates_io(&config).unwrap();
431431
let a_pkg = PackageId::new("a", "0.1.0", crates_io).unwrap();
432432
let dep_pkg = PackageId::new("dep", "0.1.0", crates_io).unwrap();
433433

0 commit comments

Comments
 (0)