refactor: rename precise_full_git_fragment to precise_git_fragment

rust-lang · Jan 4, 2024 · 093f7c8 · 093f7c8
1 parent ce551d7
commit 093f7c8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/cargo/core/source_id.rs b/src/cargo/core/source_id.rs
@@ -460,10 +460,6 @@ impl SourceId {
     }
 
     pub fn precise_git_fragment(self) -> Option<&'static str> {
-        self.precise_full_git_fragment().map(|s| &s[..8])
-    }
-
-    pub fn precise_full_git_fragment(self) -> Option<&'static str> {
         match &self.inner.precise {
             Some(Precise::GitUrlFragment(s)) => Some(&s),
             _ => None,

diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs
@@ -167,7 +167,7 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
                 format!(
                     "{} -> #{}",
                     removed[0],
-                    &added[0].source_id().precise_git_fragment().unwrap()
+                    &added[0].source_id().precise_git_fragment().unwrap()[..8],
                 )
             } else {
                 format!("{} -> v{}", removed[0], added[0].version())

diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
@@ -103,7 +103,7 @@ impl<'cfg> GitSource<'cfg> {
         let remote = GitRemote::new(source_id.url());
         // Fallback to git ref from mainfest if there is no locked revision.
         let locked_rev = source_id
-            .precise_full_git_fragment()
+            .precise_git_fragment()
             .map(|s| Revision::new(s.into()))
             .unwrap_or_else(|| source_id.git_reference().unwrap().clone().into());
 
@@ -199,7 +199,6 @@ impl From<Revision> for GitReference {
     }
 }
 
-
 /// Create an identifier from a URL,
 /// essentially turning `proto://host/path/repo` into `repo-<hash-of-url>`.
 fn ident(id: &SourceId) -> String {