22//!
33//! Note: Some tests are located in the resolver-tests package.
44
5- #![ allow( deprecated) ]
6-
75use cargo_test_support:: project;
86use cargo_test_support:: registry:: Package ;
7+ use cargo_test_support:: str;
98
109#[ cargo_test]
1110fn simple ( ) {
@@ -30,13 +29,12 @@ fn simple() {
3029
3130 p. cargo ( "generate-lockfile -Zdirect-minimal-versions" )
3231 . masquerade_as_nightly_cargo ( & [ "direct-minimal-versions" ] )
33- . with_stderr (
34- "\
35- [UPDATING] [..]
32+ . with_stderr_data ( str![ [ r#"
33+ [UPDATING] `dummy-registry` index
3634[LOCKING] 2 packages
3735[ADDING] dep v1.0.0 (latest: v1.1.0)
38- " ,
39- )
36+
37+ "# ] ] )
4038 . run ( ) ;
4139
4240 let lock = p. read_lockfile ( ) ;
@@ -79,20 +77,20 @@ fn mixed_dependencies() {
7977 p. cargo ( "generate-lockfile -Zdirect-minimal-versions" )
8078 . masquerade_as_nightly_cargo ( & [ "direct-minimal-versions" ] )
8179 . with_status ( 101 )
82- . with_stderr (
83- r#" [UPDATING] [..]
80+ . with_stderr_data ( str! [ [ r#"
81+ [UPDATING] `dummy-registry` index
8482[ERROR] failed to select a version for `dep`.
85- ... required by package `foo v0.0.1 ([CWD] )`
83+ ... required by package `foo v0.0.1 ([ROOT]/foo )`
8684versions that meet the requirements `^1.1` are: 1.1.0
8785
8886all possible versions conflict with previously selected packages.
8987
9088 previously selected package `dep v1.0.0`
91- ... which satisfies dependency `dep = "^1.0"` of package `foo v0.0.1 ([CWD] )`
89+ ... which satisfies dependency `dep = "^1.0"` of package `foo v0.0.1 ([ROOT]/foo )`
9290
9391failed to select a version for `dep` which could resolve this conflict
94- "# ,
95- )
92+
93+ "# ] ] )
9694 . run ( ) ;
9795}
9896
@@ -120,13 +118,12 @@ fn yanked() {
120118
121119 p. cargo ( "generate-lockfile -Zdirect-minimal-versions" )
122120 . masquerade_as_nightly_cargo ( & [ "direct-minimal-versions" ] )
123- . with_stderr (
124- "\
125- [UPDATING] [..]
121+ . with_stderr_data ( str![ [ r#"
122+ [UPDATING] `dummy-registry` index
126123[LOCKING] 2 packages
127124[ADDING] dep v1.1.0 (latest: v1.2.0)
128- " ,
129- )
125+
126+ "# ] ] )
130127 . run ( ) ;
131128
132129 let lock = p. read_lockfile ( ) ;
@@ -175,13 +172,12 @@ fn indirect() {
175172
176173 p. cargo ( "generate-lockfile -Zdirect-minimal-versions" )
177174 . masquerade_as_nightly_cargo ( & [ "direct-minimal-versions" ] )
178- . with_stderr (
179- "\
180- [UPDATING] [..]
175+ . with_stderr_data ( str![ [ r#"
176+ [UPDATING] `dummy-registry` index
181177[LOCKING] 3 packages
182178[ADDING] direct v1.0.0 (latest: v1.1.0)
183- " ,
184- )
179+
180+ "# ] ] )
185181 . run ( ) ;
186182
187183 let lock = p. read_lockfile ( ) ;
@@ -240,20 +236,20 @@ fn indirect_conflict() {
240236 p. cargo ( "generate-lockfile -Zdirect-minimal-versions" )
241237 . masquerade_as_nightly_cargo ( & [ "direct-minimal-versions" ] )
242238 . with_status ( 101 )
243- . with_stderr (
244- r#" [UPDATING] [..]
239+ . with_stderr_data ( str! [ [ r#"
240+ [UPDATING] `dummy-registry` index
245241[ERROR] failed to select a version for `indirect`.
246242 ... required by package `direct v1.0.0`
247- ... which satisfies dependency `direct = "^1.0"` of package `foo v0.0.1 ([CWD] )`
243+ ... which satisfies dependency `direct = "^1.0"` of package `foo v0.0.1 ([ROOT]/foo )`
248244versions that meet the requirements `^2.1` are: 2.2.0, 2.1.0
249245
250246all possible versions conflict with previously selected packages.
251247
252248 previously selected package `indirect v2.0.0`
253- ... which satisfies dependency `indirect = "^2.0"` of package `foo v0.0.1 ([CWD] )`
249+ ... which satisfies dependency `indirect = "^2.0"` of package `foo v0.0.1 ([ROOT]/foo )`
254250
255251failed to select a version for `indirect` which could resolve this conflict
256- "# ,
257- )
252+
253+ "# ] ] )
258254 . run ( ) ;
259255}
0 commit comments