From f3adda2806fbacb8d736fc636dbf5ace3e0acfac Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 3 Jun 2024 15:16:18 -0500 Subject: [PATCH] refactor(path): Clarify the relationship between read_packages and update --- src/cargo/sources/path.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index aa04f6719..7ac1513e6 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -264,10 +264,14 @@ impl<'gctx> RecursivePathSource<'gctx> { if self.updated { Ok(self.packages.clone()) } else { - ops::read_packages(&self.path, self.source_id, self.gctx) + self.read_packages_inner() } } + fn read_packages_inner(&self) -> CargoResult> { + ops::read_packages(&self.path, self.source_id, self.gctx) + } + /// List all files relevant to building this package inside this source. /// /// This function will use the appropriate methods to determine the @@ -301,7 +305,7 @@ impl<'gctx> RecursivePathSource<'gctx> { /// Discovers packages inside this source if it hasn't yet done. pub fn update(&mut self) -> CargoResult<()> { if !self.updated { - let packages = self.read_packages()?; + let packages = self.read_packages_inner()?; self.packages.extend(packages.into_iter()); self.updated = true; }