@@ -105,7 +105,6 @@ pub use cargo_test_macro::cargo_test;
105
105
pub mod compare;
106
106
pub mod containers;
107
107
pub mod cross_compile;
108
- mod diff;
109
108
pub mod git;
110
109
pub mod install;
111
110
pub mod paths;
@@ -651,8 +650,6 @@ pub struct Execs {
651
650
expect_stderr_contains : Vec < String > ,
652
651
expect_stdout_not_contains : Vec < String > ,
653
652
expect_stderr_not_contains : Vec < String > ,
654
- expect_stdout_unordered : Vec < String > ,
655
- expect_stderr_unordered : Vec < String > ,
656
653
expect_stderr_with_without : Vec < ( Vec < String > , Vec < String > ) > ,
657
654
stream_output : bool ,
658
655
assert : snapbox:: Assert ,
@@ -751,43 +748,6 @@ impl Execs {
751
748
self
752
749
}
753
750
754
- /// Verifies that all of the stdout output is equal to the given lines,
755
- /// ignoring the order of the lines.
756
- ///
757
- /// See [`Execs::with_stderr_unordered`] for more details.
758
- #[ deprecated( note = "replaced with `Execs::with_stdout_data(expected.unordered())`" ) ]
759
- pub fn with_stdout_unordered < S : ToString > ( & mut self , expected : S ) -> & mut Self {
760
- self . expect_stdout_unordered . push ( expected. to_string ( ) ) ;
761
- self
762
- }
763
-
764
- /// Verifies that all of the stderr output is equal to the given lines,
765
- /// ignoring the order of the lines.
766
- ///
767
- /// See [`compare`] for supported patterns.
768
- ///
769
- /// This is useful when checking the output of `cargo build -v` since
770
- /// the order of the output is not always deterministic.
771
- /// Recommend use `with_stderr_contains` instead unless you really want to
772
- /// check *every* line of output.
773
- ///
774
- /// Be careful when using patterns such as `[..]`, because you may end up
775
- /// with multiple lines that might match, and this is not smart enough to
776
- /// do anything like longest-match. For example, avoid something like:
777
- ///
778
- /// ```text
779
- /// [RUNNING] `rustc [..]
780
- /// [RUNNING] `rustc --crate-name foo [..]
781
- /// ```
782
- ///
783
- /// This will randomly fail if the other crate name is `bar`, and the
784
- /// order changes.
785
- #[ deprecated( note = "replaced with `Execs::with_stderr_data(expected.unordered())`" ) ]
786
- pub fn with_stderr_unordered < S : ToString > ( & mut self , expected : S ) -> & mut Self {
787
- self . expect_stderr_unordered . push ( expected. to_string ( ) ) ;
788
- self
789
- }
790
-
791
751
/// Verify that a particular line appears in stderr with and without the
792
752
/// given substrings. Exactly one line must match.
793
753
///
@@ -993,8 +953,6 @@ impl Execs {
993
953
&& self . expect_stderr_contains . is_empty ( )
994
954
&& self . expect_stdout_not_contains . is_empty ( )
995
955
&& self . expect_stderr_not_contains . is_empty ( )
996
- && self . expect_stdout_unordered . is_empty ( )
997
- && self . expect_stderr_unordered . is_empty ( )
998
956
&& self . expect_stderr_with_without . is_empty ( )
999
957
{
1000
958
panic ! (
@@ -1107,12 +1065,6 @@ impl Execs {
1107
1065
for expect in self . expect_stderr_not_contains . iter ( ) {
1108
1066
compare:: match_does_not_contain ( expect, stderr, cwd) ?;
1109
1067
}
1110
- for expect in self . expect_stdout_unordered . iter ( ) {
1111
- compare:: match_unordered ( expect, stdout, cwd) ?;
1112
- }
1113
- for expect in self . expect_stderr_unordered . iter ( ) {
1114
- compare:: match_unordered ( expect, stderr, cwd) ?;
1115
- }
1116
1068
for ( with, without) in self . expect_stderr_with_without . iter ( ) {
1117
1069
compare:: match_with_without ( stderr, with, without, cwd) ?;
1118
1070
}
@@ -1141,8 +1093,6 @@ pub fn execs() -> Execs {
1141
1093
expect_stderr_contains : Vec :: new ( ) ,
1142
1094
expect_stdout_not_contains : Vec :: new ( ) ,
1143
1095
expect_stderr_not_contains : Vec :: new ( ) ,
1144
- expect_stdout_unordered : Vec :: new ( ) ,
1145
- expect_stderr_unordered : Vec :: new ( ) ,
1146
1096
expect_stderr_with_without : Vec :: new ( ) ,
1147
1097
stream_output : false ,
1148
1098
assert : compare:: assert_e2e ( ) ,
0 commit comments