Refactor -> move simple resolver to separate mod #1452
+203
−167
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
This was referenced Jul 17, 2024
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
from
57c7fea
to
5e3f300
Compare
This was referenced Jul 17, 2024
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
2 times, most recently
from
beead3d
to
8a59b68
Compare
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
from
8a59b68
to
7c6c170
Compare
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
2 times, most recently
from
cc55fb9
to
d1e14cf
Compare
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
3 times, most recently
from
f3db9da
to
0fb9853
Compare
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
2 times, most recently
from
836e39b
to
d2c9ab4
Compare
commit-id:3ba8d8f0
maciektr
force-pushed
the
spr/main/3ba8d8f0
branch
from
d2c9ab4
to
d500c74
Compare
mkaput
requested changes
Nov 25, 2024
Comment on lines
+37
to
+40
| let algo_primitive = env::var("SCARB_UNSTABLE_PRIMITIVE_RESOLVER") | ||
| .ok() | ||
| .map(|var| var.as_str() == "true") | ||
| .unwrap_or(true); |
There was a problem hiding this comment.
I'd rather model config as "enable" rather than "disable"
Suggested change
| let algo_primitive = env::var("SCARB_UNSTABLE_PRIMITIVE_RESOLVER") | |
| .ok() | |
| .map(|var| var.as_str() == "true") | |
| .unwrap_or(true); | |
| let algo_primitive = env::var("SCARB_PUBGRUB") | |
| .ok() | |
| .map(|var| { | |
| let s = var.as_str(); | |
| s == "true" || s == "1" | |
| }) | |
| .unwrap_or(false); |
wawel37
approved these changes
Nov 25, 2024
| registry: &dyn Registry, | ||
| package_id: &PackageId, | ||
| dependency: &ManifestDependency, | ||
| ) -> anyhow::Result<ManifestDependency> { |
There was a problem hiding this comment.
nit: import the result directly
| summaries: &[Summary], | ||
| registry: &dyn Registry, | ||
| lockfile: Lockfile, | ||
| ) -> anyhow::Result<Resolve> { |
There was a problem hiding this comment.
nit: import the result directly
| Perhaps in the future this conflict could be resolved, but currently, | ||
| please upgrade your dependencies to use latest versions of their dependencies. | ||
| "}); | ||
| let algo_primitive = env::var("SCARB_UNSTABLE_PRIMITIVE_RESOLVER") |
There was a problem hiding this comment.
nit:
Suggested change
| let algo_primitive = env::var("SCARB_UNSTABLE_PRIMITIVE_RESOLVER") | |
| let algo_primitive = env::var("SCARB_UNSTABLE_PRIMITIVE_DEPENDENCY_RESOLVER") |
| _summaries: &[Summary], | ||
| _registry: &dyn Registry, | ||
| _lockfile: Lockfile, | ||
| ) -> anyhow::Result<Resolve> { |
There was a problem hiding this comment.
nit: import the result directly
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.
Stack: