From 93cee99368d0d268c1b3ba01f5691fa90e35ece1 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 15 Oct 2024 11:13:28 -0400 Subject: [PATCH] rustc_metadata: move comment closer to code This was added in cc3c8bbfaf5af19caf3deb131a995a65ca4674f9 when it was closer to the `extract_one` call. Move it back near that call. --- compiler/rustc_metadata/src/locator.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_metadata/src/locator.rs b/compiler/rustc_metadata/src/locator.rs index 99c673b021a90..d53a19aa47b30 100644 --- a/compiler/rustc_metadata/src/locator.rs +++ b/compiler/rustc_metadata/src/locator.rs @@ -499,8 +499,11 @@ impl<'a> CrateLocator<'a> { dylibs: FxIndexMap, ) -> Result, CrateError> { let mut slot = None; - // Order here matters, rmeta should come first. See comment in - // `extract_one` below. + // Order here matters, rmeta should come first. + // + // Make sure there's at most one rlib and at most one dylib. + // + // See comment in `extract_one` below. let source = CrateSource { rmeta: self.extract_one(rmetas, CrateFlavor::Rmeta, &mut slot)?, rlib: self.extract_one(rlibs, CrateFlavor::Rlib, &mut slot)?, @@ -729,7 +732,6 @@ impl<'a> CrateLocator<'a> { || file.starts_with(self.target.dll_prefix.as_ref()) && file.ends_with(self.target.dll_suffix.as_ref()) { - // Make sure there's at most one rlib and at most one dylib. // Note to take care and match against the non-canonicalized name: // some systems save build artifacts into content-addressed stores // that do not preserve extensions, and then link to them using