Skip to content

Commit 28f36c7

Browse files
committed
refactor: Clarify direct-construction function for PackageId
1 parent 378502b commit 28f36c7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/cargo/core/package_id.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl<'de> de::Deserialize<'de> for PackageId {
8888
strip_parens(rest).ok_or_else(|| de::Error::custom("invalid serialized PackageId"))?;
8989
let source_id = SourceId::from_url(url).map_err(de::Error::custom)?;
9090

91-
Ok(PackageId::pure(name, version, source_id))
91+
Ok(PackageId::new(name, version, source_id))
9292
}
9393
}
9494

@@ -129,10 +129,10 @@ impl PackageId {
129129
sid: SourceId,
130130
) -> CargoResult<PackageId> {
131131
let v = version.parse()?;
132-
Ok(PackageId::pure(name.into(), v, sid))
132+
Ok(PackageId::new(name.into(), v, sid))
133133
}
134134

135-
pub fn pure(name: InternedString, version: semver::Version, source_id: SourceId) -> PackageId {
135+
pub fn new(name: InternedString, version: semver::Version, source_id: SourceId) -> PackageId {
136136
let inner = PackageIdInner {
137137
name,
138138
version,
@@ -161,7 +161,7 @@ impl PackageId {
161161
}
162162

163163
pub fn with_source_id(self, source: SourceId) -> PackageId {
164-
PackageId::pure(self.inner.name, self.inner.version.clone(), source)
164+
PackageId::new(self.inner.name, self.inner.version.clone(), source)
165165
}
166166

167167
pub fn map_source(self, to_replace: SourceId, replace_with: SourceId) -> Self {

src/cargo/sources/registry/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ impl IndexSummary {
944944
} = serde_json::from_slice(line)?;
945945
let v = v.unwrap_or(1);
946946
tracing::trace!("json parsed registry {}/{}", name, vers);
947-
let pkgid = PackageId::pure(name.into(), vers.clone(), source_id);
947+
let pkgid = PackageId::new(name.into(), vers.clone(), source_id);
948948
let deps = deps
949949
.into_iter()
950950
.map(|dep| dep.into_dep(source_id))

src/cargo/util/toml/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ pub fn to_real_manifest(
500500

501501
package.version = version.clone().map(manifest::InheritableField::Value);
502502

503-
let pkgid = PackageId::pure(
503+
let pkgid = PackageId::new(
504504
package.name.as_str().into(),
505505
version
506506
.clone()

0 commit comments

Comments
 (0)