@@ -4,7 +4,7 @@ use std::fs::{self, OpenOptions};
4
4
use std:: io:: prelude:: * ;
5
5
use std:: path:: Path ;
6
6
7
- use cargo_test_support:: { compare} ;
7
+ use cargo_test_support:: compare;
8
8
use cargo_test_support:: cross_compile;
9
9
use cargo_test_support:: git;
10
10
use cargo_test_support:: registry:: { self , registry_path, Package } ;
@@ -572,14 +572,14 @@ fn multiple_binaries_error() {
572
572
cargo_process ( "install --git" )
573
573
. arg ( p. url ( ) . to_string ( ) )
574
574
. with_status ( 101 )
575
- . with_stderr (
576
- format ! ( "\
575
+ . with_stderr ( format ! (
576
+ "\
577
577
[UPDATING] git repository [..]
578
578
[ERROR] multiple packages with binaries found: bar, foo. \
579
579
When installing a git repository, cargo will always search the entire repo for any Cargo.toml.\n \
580
580
Please specify a package, e.g. `cargo install --git {git_url} bar`.
581
- " ) ,
582
- )
581
+ "
582
+ ) )
583
583
. run ( ) ;
584
584
}
585
585
@@ -591,18 +591,20 @@ fn multiple_examples_error() {
591
591
. file ( "examples/ex1.rs" , "fn main() {}" )
592
592
. file ( "bar/Cargo.toml" , & basic_manifest ( "bar" , "0.1.0" ) )
593
593
. file ( "bar/src/lib.rs" , "" )
594
- . file ( "bar/examples/ex1.rs" , "fn main() {}" , )
594
+ . file ( "bar/examples/ex1.rs" , "fn main() {}" )
595
595
. build ( ) ;
596
-
596
+
597
597
let git_url = p. url ( ) . to_string ( ) ;
598
598
cargo_process ( "install --example ex1 --git" )
599
599
. arg ( p. url ( ) . to_string ( ) )
600
600
. with_status ( 101 )
601
- . with_stderr ( format ! ( "\
601
+ . with_stderr ( format ! (
602
+ "\
602
603
[UPDATING] git repository [..]
603
604
[ERROR] multiple packages with examples found: bar, foo. \
604
605
When installing a git repository, cargo will always search the entire repo for any Cargo.toml.\n \
605
- Please specify a package, e.g. `cargo install --git {git_url} bar`.") )
606
+ Please specify a package, e.g. `cargo install --git {git_url} bar`."
607
+ ) )
606
608
. run ( ) ;
607
609
}
608
610
@@ -768,7 +770,6 @@ fn multiple_crates_auto_examples() {
768
770
assert_has_installed_exe ( cargo_home ( ) , "foo" ) ;
769
771
}
770
772
771
-
772
773
#[ cargo_test]
773
774
fn no_binaries_or_examples ( ) {
774
775
let p = project ( )
0 commit comments