File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -165,7 +165,11 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
165
165
|| line. contains ( "error: cyclic package dependency: package " )
166
166
{
167
167
broken_deps = true ;
168
- } else if line. contains ( "error: failed to parse lock file at" ) {
168
+ } else if line. contains ( "error: failed to parse lock file at" )
169
+ || line. contains (
170
+ "error: Attempting to resolve a dependency with more than one crate with links=" ,
171
+ )
172
+ {
169
173
broken_lockfile = true ;
170
174
}
171
175
} ;
Original file line number Diff line number Diff line change @@ -331,7 +331,7 @@ test_prepare_error_stderr!(
331
331
"error: invalid type: map, expected a string"
332
332
) ;
333
333
334
- test_prepare_unknown_err ! (
334
+ test_prepare_error_stderr ! (
335
335
test_invalid_cargotoml_conflicting_links,
336
336
"invalid-cargotoml-conflicting-links" ,
337
337
InvalidCargoLock ,
You can’t perform that action at this time.
0 commit comments