feat(resolver): Add CLI option to resolve minimal version dependencies #5200

klausi · 2018-03-18T21:42:20Z

Test cases are still missing. We need to come up with a plan what cases we want to cover.

Thanks a lot to @Eh2406 for very helpful instructions to kick this off.

Eh2406 · 2018-03-19T00:21:11Z

Thanks for working on this! Let me know when this is ready for review, or if there is anything else I can do to help?

One complication is that @alexcrichton has recently #5180 add code that uses the sort to preserve the lock file. I think we should always have in_previous first; then only the .summary.version() should be subject to this switch. @alexcrichton what do you think?

Also where is @rust-highfive to set:
r? @alexcrichton

alexcrichton · 2018-03-19T21:38:03Z

I think we should always have in_previous first; then only the .summary.version() should be subject to this switch. @alexcrichton what do you think?

Agreed!

klausi · 2018-03-20T22:00:31Z

Added a test case, this should now be ready for review.

I tried to follow your suggestion to only apply the switch when in_previous has been checked:

ret.sort_unstable_by(|a, b| {
    let a_in_previous = self.try_to_use.contains(a.summary.package_id());
    let b_in_previous = self.try_to_use.contains(b.summary.package_id());
    let previous_cmp = a_in_previous.cmp(&b_in_previous);
    match previous_cmp {
        Ordering::Equal => {
            let cmp = a.summary.version().cmp(&b.summary.version());
            match self.minimal_versions {
                true => cmp.reverse(),
                false => cmp,
            }
        },
        _ => previous_cmp,
    }
});

But that does not work and then my test case fails. Maybe I need to specify a more elaborate test case that would then drive around this in_previous check? Or maybe we always need to reverse() as it is in the PR changes right now?

Eh2406 · 2018-03-20T22:25:11Z

Thanks for working on this. That looks like it should work. I wonder why the test fails with that code. I can experiment with it when I get home.

Eh2406 · 2018-03-20T23:40:31Z

Got it the old code was a.cmp(&b).reverse()! So that means the new code needs a .reverse() at the end asswell. (or any number of equivalent ways of writing it, if it makes things clearer. For example the .then_with( method may be easier to read, and match on a bool is somtimes cleaner as an if.

alexcrichton · 2018-03-21T14:07:12Z

@bors: r+

This looks great, thanks @klausi!

bors · 2018-03-21T14:07:15Z

📌 Commit 5907a8b has been approved by alexcrichton

Eh2406 · 2018-03-21T14:23:44Z

@alexcrichton This does not yet handle the lock file stufe correctly.

alexcrichton · 2018-03-21T14:26:03Z

@bors: r-

oh? How so? (I think I missed that...)

Eh2406 · 2018-03-21T14:50:52Z

#5200 (comment) suggested how to handle it correctly, but it was failing the test. So it was Not committed. #5200 (comment) figured out how to get it working, but that has not yet been incorporated.

After that is fixed there are some nits, working on a revue now, then we will be good.

Eh2406

Overall, almost there.

Eh2406 · 2018-03-21T14:59:17Z

tests/testsuite/resolve.rs

@@ -45,6 +45,45 @@ fn resolve(
    Ok(res)
 }

+// Clone of resolve() from above that also passes down a Config instance.


I am not fond of the copy/paste code duplication, but if @klausi thinks that it is the best solution I am ok with it.
As an alternative thought if this takes an Option<&Config> then resolve can just call resolve_with_config(...,None).

Eh2406 · 2018-03-21T15:11:05Z

tests/testsuite/resolve.rs

@@ -320,6 +359,48 @@ fn test_resolving_maximum_version_with_transitive_deps() {
    assert_that(&res, is_not(contains(names(&[("util", "1.1.1")]))));
 }

+#[test]
+fn test_resolving_minimum_version_with_transitive_deps() {


I really like this test, it concisely demonstrates both properties of minimal-versions, that it chooses the smallest version while meeting all the requirements. Mabey a comment at the beginning explaining that for the next reader. @alexcrichton has been trying to teach me to leave more comments.

Also @alexcrichton, do you think this needs a full integration test that calls cargo -Z minimal-versions or is this sufficient?

Oh sorry I missed this. Yeah @klausi mind adding a small integration test to ensure that the flag is plumbed to the right location?

Eh2406 · 2018-03-21T15:19:28Z

src/cargo/core/resolver/mod.rs

+            match self.minimal_versions {
+                true => a.cmp(&b),
+                false => a.cmp(&b).reverse(),
+            }


This needs your code from #5200 (comment). Also match on a bool is somtimes better as an if, and the .then_with( method may be helpfull. I leave it to your judgment.

…document tests

klausi · 2018-03-23T17:30:52Z

Thanks a lot @Eh2406 , again :-)

Very good feedback, I think I covered your points now.

klausi · 2018-03-23T19:00:04Z

And now with integration test. tests/testsuite/generate_lockfile.rs might not be the best place to put it, any better suggestions?

klausi · 2018-03-23T19:08:05Z

Moved the integration test right after the resolver test, I guess it makes sense to just have them together there.

Eh2406 · 2018-03-23T19:18:39Z

This looks good to me, r+! Thank you @klausi.

alexcrichton · 2018-03-23T19:20:07Z

@bors: delegate=Eh2406 r=Eh2406

bors · 2018-03-23T19:20:08Z

📌 Commit a38184f has been approved by Eh2406

bors · 2018-03-23T19:20:08Z

✌️ @Eh2406 can now approve this pull request

bors · 2018-03-23T19:20:15Z

⌛ Testing commit a38184f with merge bcd0300...

@Eh2406

feat(resolver): Add CLI option to resolve minimal version dependencies Fixes #4100 Test cases are still missing. We need to come up with a plan what cases we want to cover. Thanks a lot to @Eh2406 for very helpful instructions to kick this off.

bors · 2018-03-23T19:57:17Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Eh2406
Pushing bcd0300 to master...

klausi added 3 commits March 20, 2018 21:49

feat(resolver): Add CLI option to resolve minimal version dependencies

9a09892

docs(resolver): Comment for what the minimal_versions flag does

2a47b6a

tests(resolver): Add test for minimum dependency versions

f2610df

klausi force-pushed the minimal_versions branch from 776b572 to f2610df Compare March 20, 2018 21:56

klausi changed the title ~~[WIP] feat(resolver): Add CLI option to resolve minimal version dependencies~~ feat(resolver): Add CLI option to resolve minimal version dependencies Mar 20, 2018

docs(tests): Add comment

5907a8b

Eh2406 requested changes Mar 21, 2018

View reviewed changes

fix(resolver): Preserve lock file when sorting for minimal versions, …

115d356

…document tests

klausi mentioned this pull request Mar 23, 2018

fix(cargo): Bump dependencies so that Tokio compiles with minimal versions tokio-rs/tokio#258

Merged

tests(resolver): Add integration test for -Z minimal-versions

131c3e2

tests(resolver): Group integration test with other minimal version test

a38184f

bors merged commit a38184f into rust-lang:master Mar 23, 2018

matklad mentioned this pull request Jun 26, 2018

Dependencies resolution with --minimal-versions #5657

Open

ehuss added this to the 1.26.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(resolver): Add CLI option to resolve minimal version dependencies #5200

feat(resolver): Add CLI option to resolve minimal version dependencies #5200

klausi commented Mar 18, 2018

Eh2406 commented Mar 19, 2018

alexcrichton commented Mar 19, 2018

klausi commented Mar 20, 2018

Eh2406 commented Mar 20, 2018

Eh2406 commented Mar 20, 2018

alexcrichton commented Mar 21, 2018

bors commented Mar 21, 2018

Eh2406 commented Mar 21, 2018

alexcrichton commented Mar 21, 2018

Eh2406 commented Mar 21, 2018

Eh2406 left a comment

Eh2406 Mar 21, 2018

Eh2406 Mar 21, 2018

alexcrichton Mar 23, 2018

klausi Mar 23, 2018

Eh2406 Mar 21, 2018

klausi commented Mar 23, 2018

klausi commented Mar 23, 2018

klausi commented Mar 23, 2018

Eh2406 commented Mar 23, 2018

alexcrichton commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018

feat(resolver): Add CLI option to resolve minimal version dependencies #5200

feat(resolver): Add CLI option to resolve minimal version dependencies #5200

Conversation

klausi commented Mar 18, 2018

Eh2406 commented Mar 19, 2018

alexcrichton commented Mar 19, 2018

klausi commented Mar 20, 2018

Eh2406 commented Mar 20, 2018

Eh2406 commented Mar 20, 2018

alexcrichton commented Mar 21, 2018

bors commented Mar 21, 2018

Eh2406 commented Mar 21, 2018

alexcrichton commented Mar 21, 2018

Eh2406 commented Mar 21, 2018

Eh2406 left a comment

Choose a reason for hiding this comment

Eh2406 Mar 21, 2018

Choose a reason for hiding this comment

Eh2406 Mar 21, 2018

Choose a reason for hiding this comment

alexcrichton Mar 23, 2018

Choose a reason for hiding this comment

klausi Mar 23, 2018

Choose a reason for hiding this comment

Eh2406 Mar 21, 2018

Choose a reason for hiding this comment

klausi commented Mar 23, 2018

klausi commented Mar 23, 2018

klausi commented Mar 23, 2018

Eh2406 commented Mar 23, 2018

alexcrichton commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018

bors commented Mar 23, 2018