fix(test): Un-deprecate contains assertions

rust-lang · Nov 7, 2024 · af3cfd5 · af3cfd5
1 parent d20216c
commit af3cfd5
Show file tree

Hide file tree

Showing 36 changed files with 0 additions and 106 deletions.
diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
@@ -816,7 +816,6 @@ impl Execs {
     /// - `expected` can end up being ambiguous, causing the assertion to succeed when it should fail
     ///
     /// </div>
-    #[deprecated(note = "replaced with `Execs::with_stdout_data(expected)`")]
     pub fn with_stdout_contains<S: ToString>(&mut self, expected: S) -> &mut Self {
         self.expect_stdout_contains.push(expected.to_string());
         self
@@ -834,7 +833,6 @@ impl Execs {
     /// - `expected` can end up being ambiguous, causing the assertion to succeed when it should fail
     ///
     /// </div>
-    #[deprecated(note = "replaced with `Execs::with_stderr_data(expected)`")]
     pub fn with_stderr_contains<S: ToString>(&mut self, expected: S) -> &mut Self {
         self.expect_stderr_contains.push(expected.to_string());
         self
@@ -857,7 +855,6 @@ impl Execs {
     /// [`Execs::with_stdout_contains`].
     ///
     /// </div>
-    #[deprecated]
     pub fn with_stdout_does_not_contain<S: ToString>(&mut self, expected: S) -> &mut Self {
         self.expect_stdout_not_contains.push(expected.to_string());
         self
@@ -879,7 +876,6 @@ impl Execs {
     /// with [`Execs::with_stderr_line_without`].
     ///
     /// </div>
-    #[deprecated]
     pub fn with_stderr_does_not_contain<S: ToString>(&mut self, expected: S) -> &mut Self {
         self.expect_stderr_not_contains.push(expected.to_string());
         self
@@ -916,7 +912,6 @@ impl Execs {
     /// This will check that a build line includes `-C opt-level=3` but does
     /// not contain `-C debuginfo` or `-C incremental`.
     ///
-    #[deprecated]
     pub fn with_stderr_line_without<S: ToString>(
         &mut self,
         with: &[S],

diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs
@@ -687,7 +687,6 @@ fn build_script_with_bin_artifact_and_lib_false() {
         )
         .build();
 
-    #[expect(deprecated)]
     p.cargo("build -Z bindeps")
         .masquerade_as_nightly_cargo(&["bindeps"])
         .with_status(101)
@@ -731,7 +730,6 @@ fn lib_with_bin_artifact_and_lib_false() {
         )
         .build();
 
-    #[expect(deprecated)]
     p.cargo("build -Z bindeps")
         .masquerade_as_nightly_cargo(&["bindeps"])
         .with_status(101)
@@ -1117,7 +1115,6 @@ fn build_script_deps_adopt_specified_target_unconditionally() {
         .file("bar/src/lib.rs", "pub fn doit() {}")
         .build();
 
-    #[expect(deprecated)]
     p.cargo("check -v -Z bindeps")
         .masquerade_as_nightly_cargo(&["bindeps"])
         .with_stderr_does_not_contain(
@@ -1233,7 +1230,6 @@ fn non_build_script_deps_adopt_specified_target_unconditionally() {
         .file("bar/src/lib.rs", "pub fn doit() {}")
         .build();
 
-    #[expect(deprecated)]
     p.cargo("check -v -Z bindeps")
         .masquerade_as_nightly_cargo(&["bindeps"])
         .with_stderr_contains(
@@ -1378,7 +1374,6 @@ fn build_script_deps_adopts_target_platform_if_target_equals_target() {
         .build();
 
     let alternate_target = cross_compile::alternate();
-    #[expect(deprecated)]
     p.cargo("check -v -Z bindeps --target")
         .arg(alternate_target)
         .masquerade_as_nightly_cargo(&["bindeps"])

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
@@ -132,7 +132,6 @@ fn cargo_compile_incremental() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn incremental_profile() {
     let p = project()
@@ -176,7 +175,6 @@ fn incremental_profile() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn incremental_config() {
     let p = project()
@@ -5180,7 +5178,6 @@ WRAPPER CALLED: rustc --crate-name foo [..]
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn rustc_wrapper_queries() {
     // Check that the invocations querying rustc for information are done with the wrapper.
@@ -5920,7 +5917,6 @@ fn build_filter_infer_profile() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn targets_selected_default() {
     let p = project().file("src/main.rs", "fn main() {}").build();
@@ -6874,7 +6870,6 @@ Caused by:
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn build_script_o0_default() {
     let p = project()
@@ -6887,7 +6882,6 @@ fn build_script_o0_default() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn build_script_o0_default_even_with_release() {
     let p = project()

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
@@ -3779,7 +3779,6 @@ fn custom_target_dir() {
     p.cargo("build -v").run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn panic_abort_with_build_scripts() {
     let p = project()

diff --git a/tests/testsuite/build_script_extra_link_arg.rs b/tests/testsuite/build_script_extra_link_arg.rs
@@ -233,7 +233,6 @@ the future. For more information, see <https://github.com/rust-lang/cargo/issues
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn link_arg_transitive_not_allowed() {
     // Verify that transitive dependencies don't pass link args.

diff --git a/tests/testsuite/cache_messages.rs b/tests/testsuite/cache_messages.rs
@@ -527,7 +527,6 @@ WRAPPER CALLED: rustc [..]
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn wacky_hashless_fingerprint() {
     // On Windows, executables don't have hashes. This checks for a bad

diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs
@@ -137,7 +137,6 @@ fn list_command_looks_at_path_case_mismatch() {
     );
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn list_command_handles_known_external_commands() {
     let p = project()

diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs
@@ -406,7 +406,6 @@ fn check_all() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn check_all_exclude() {
     let p = project()
@@ -433,7 +432,6 @@ fn check_all_exclude() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn check_all_exclude_glob() {
     let p = project()
@@ -491,7 +489,6 @@ fn check_virtual_all_implied() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn check_virtual_manifest_one_project() {
     let p = project()
@@ -518,7 +515,6 @@ fn check_virtual_manifest_one_project() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn check_virtual_manifest_glob() {
     let p = project()
@@ -559,7 +555,6 @@ fn exclude_warns_on_non_existing_package() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn targets_selected_default() {
     let foo = project()
@@ -633,7 +628,6 @@ error[E0425]: cannot find value `badtext` in this scope
         .run();
 }
 
-#[expect(deprecated)]
 // Verify what is checked with various command-line filters.
 #[cargo_test]
 fn check_filters() {
@@ -1000,7 +994,6 @@ WRAPPER CALLED: rustc --crate-name foo [..]
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn rustc_workspace_wrapper_respects_primary_units() {
     let p = project()
@@ -1024,7 +1017,6 @@ fn rustc_workspace_wrapper_respects_primary_units() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn rustc_workspace_wrapper_excludes_published_deps() {
     let p = project()

diff --git a/tests/testsuite/check_cfg.rs b/tests/testsuite/check_cfg.rs
@@ -30,7 +30,6 @@ macro_rules! x {
     }};
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features() {
     let p = project()
@@ -56,7 +55,6 @@ fn features() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_with_deps() {
     let p = project()
@@ -87,7 +85,6 @@ fn features_with_deps() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_with_opt_deps() {
     let p = project()
@@ -119,7 +116,6 @@ fn features_with_opt_deps() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_with_namespaced_features() {
     let p = project()
@@ -150,7 +146,6 @@ fn features_with_namespaced_features() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_fingerprint() {
     let p = project()
@@ -228,7 +223,6 @@ fn features_fingerprint() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn well_known_names_values() {
     let p = project()
@@ -242,7 +236,6 @@ fn well_known_names_values() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_test() {
     let p = project()
@@ -268,7 +261,6 @@ fn features_test() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_doctest() {
     let p = project()
@@ -297,7 +289,6 @@ fn features_doctest() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn well_known_names_values_test() {
     let p = project()
@@ -311,7 +302,6 @@ fn well_known_names_values_test() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn well_known_names_values_doctest() {
     let p = project()
@@ -327,7 +317,6 @@ fn well_known_names_values_doctest() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn features_doc() {
     let p = project()
@@ -354,7 +343,6 @@ fn features_doc() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn build_script_feedback() {
     let p = project()
@@ -382,7 +370,6 @@ fn build_script_feedback() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn build_script_doc() {
     let p = project()
@@ -421,7 +408,6 @@ fn build_script_doc() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn build_script_override() {
     let target = cargo_test_support::rustc_host();
@@ -531,7 +517,6 @@ test [..] ... ok
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_simple() {
     let p = project()
@@ -557,7 +542,6 @@ fn config_simple() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_workspace() {
     let p = project()
@@ -599,7 +583,6 @@ fn config_workspace() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_workspace_not_inherited() {
     let p = project()
@@ -631,7 +614,6 @@ fn config_workspace_not_inherited() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_invalid_position() {
     let p = project()
@@ -746,7 +728,6 @@ Caused by:
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_and_features() {
     let p = project()
@@ -836,7 +817,6 @@ fn config_with_cargo_test() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_and_build_script() {
     let p = project()
@@ -866,7 +846,6 @@ fn config_and_build_script() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_features_and_build_script() {
     let p = project()
@@ -902,7 +881,6 @@ fn config_features_and_build_script() {
         .run();
 }
 
-#[expect(deprecated)]
 #[cargo_test]
 fn config_fingerprint() {
     let p = project()