Small resolver cleanups #15040
Draft
Small resolver cleanups #15040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
rustbot
added
A-dependency-resolution
weihanglo
reviewed
Jan 9, 2025
| // Well if we made it this far then we've got a valid dependency. We | ||
| // want this iterator to be inherently "peekable" so we don't | ||
| // necessarily return the item just yet. Instead we stash it away to | ||
| // get returned later, and if we replaced something then that was | ||
| // actually the candidate to try first so we return that. | ||
| if let Some(r) = mem::replace(&mut self.has_another, Some(b.clone())) { | ||
| if let Some(r) = self.has_another.replace(b.clone()) { |
There was a problem hiding this comment.
warning: unused import: `std::mem`
--> src/cargo/core/resolver/mod.rs:62:5
|
62 | use std::mem;
| ^^^^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: `cargo` (lib) generated 1 warning (run `cargo fix --lib -p cargo` to apply 1 suggestion)
There was a problem hiding this comment.
that's what I get for trying to manually cherry pick.
Eh2406
commented
Jan 9, 2025
| @@ -142,9 +142,7 @@ pub fn resolve( | |||
| let mut past_conflicting_activations = conflict_cache::ConflictCache::new(); | |||
|
|
|||
| let resolver_ctx = loop { | |||
| let resolver_ctx = ResolverContext::new(); | |||
There was a problem hiding this comment.
Thinking about this more, I wonder if this was a (failed) attempt to reuse memory. Perhaps let mut resolver_ctx = ResolverContext::new(); outside the loop and resolver_ctx.clear() inside the loop was the original intent.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just too small resolver cleanups I found while doing some other work.