Skip to content

Commit 4abd05e

Browse files
committed
test(resolver): Enable msrv-policy
This was kept separate to show that the prior commit didn't change anything for stable users.
1 parent 4820624 commit 4abd05e

File tree

1 file changed

+33
-10
lines changed

1 file changed

+33
-10
lines changed

tests/testsuite/rust_version.rs

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,21 +213,34 @@ fn dependency_rust_version_newer_than_package() {
213213
.build();
214214

215215
p.cargo("check --ignore-rust-version")
216+
.arg("-Zmsrv-policy")
217+
.masquerade_as_nightly_cargo(&["msrv-policy"])
218+
// This shouldn't fail
219+
.with_status(101)
216220
.with_stderr(
217221
"\
218222
[UPDATING] `dummy-registry` index
219-
[DOWNLOADING] crates ...
220-
[DOWNLOADED] bar v1.6.0 (registry `dummy-registry`)
221-
[CHECKING] bar v1.6.0
222-
[CHECKING] [..]
223-
[FINISHED] [..]
223+
[ERROR] failed to select a version for the requirement `bar = \"^1.0.0\"`
224+
candidate versions found which didn't match: 1.6.0
225+
location searched: `dummy-registry` index (which is replacing registry `crates-io`)
226+
required by package `foo v0.0.1 ([CWD])`
227+
perhaps a crate was updated and forgotten to be re-vendored?
224228
",
225229
)
226230
.run();
227231
p.cargo("check")
232+
.arg("-Zmsrv-policy")
233+
.masquerade_as_nightly_cargo(&["msrv-policy"])
234+
.with_status(101)
235+
// This should have a better error message
228236
.with_stderr(
229237
"\
230-
[FINISHED] [..]
238+
[UPDATING] `dummy-registry` index
239+
[ERROR] failed to select a version for the requirement `bar = \"^1.0.0\"`
240+
candidate versions found which didn't match: 1.6.0
241+
location searched: `dummy-registry` index (which is replacing registry `crates-io`)
242+
required by package `foo v0.0.1 ([CWD])`
243+
perhaps a crate was updated and forgotten to be re-vendored?
231244
",
232245
)
233246
.run();
@@ -261,18 +274,23 @@ fn dependency_rust_version_older_and_newer_than_package() {
261274
.build();
262275

263276
p.cargo("check --ignore-rust-version")
277+
.arg("-Zmsrv-policy")
278+
.masquerade_as_nightly_cargo(&["msrv-policy"])
279+
// This should pick 1.6.0
264280
.with_stderr(
265281
"\
266282
[UPDATING] `dummy-registry` index
267283
[DOWNLOADING] crates ...
268-
[DOWNLOADED] bar v1.6.0 (registry `dummy-registry`)
269-
[CHECKING] bar v1.6.0
284+
[DOWNLOADED] bar v1.5.0 (registry `dummy-registry`)
285+
[CHECKING] bar v1.5.0
270286
[CHECKING] [..]
271287
[FINISHED] [..]
272288
",
273289
)
274290
.run();
275291
p.cargo("check")
292+
.arg("-Zmsrv-policy")
293+
.masquerade_as_nightly_cargo(&["msrv-policy"])
276294
.with_stderr(
277295
"\
278296
[FINISHED] [..]
@@ -329,18 +347,23 @@ fn workspace_with_mixed_rust_version() {
329347
.build();
330348

331349
p.cargo("check --ignore-rust-version")
350+
.arg("-Zmsrv-policy")
351+
.masquerade_as_nightly_cargo(&["msrv-policy"])
352+
// This should pick 1.6.0
332353
.with_stderr(
333354
"\
334355
[UPDATING] `dummy-registry` index
335356
[DOWNLOADING] crates ...
336-
[DOWNLOADED] bar v1.6.0 (registry `dummy-registry`)
337-
[CHECKING] bar v1.6.0
357+
[DOWNLOADED] bar v1.4.0 (registry `dummy-registry`)
358+
[CHECKING] bar v1.4.0
338359
[CHECKING] [..]
339360
[FINISHED] [..]
340361
",
341362
)
342363
.run();
343364
p.cargo("check")
365+
.arg("-Zmsrv-policy")
366+
.masquerade_as_nightly_cargo(&["msrv-policy"])
344367
.with_stderr(
345368
"\
346369
[FINISHED] [..]

0 commit comments

Comments
 (0)