test: Remove empty snapshots for UI tests

rust-lang · Feb 20, 2024 · ac453f1 · ac453f1
1 parent 2e878a4
commit ac453f1
Show file tree

Hide file tree

Showing 442 changed files with 441 additions and 222 deletions.
diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/add_basic/stdout.log b/tests/testsuite/cargo_add/add_basic/stdout.log
diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/add_multiple/stdout.log b/tests/testsuite/cargo_add/add_multiple/stdout.log
diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -34,7 +35,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log b/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log
diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/add_toolchain/stdout.log b/tests/testsuite/cargo_add/add_toolchain/stdout.log
diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/build/stdout.log b/tests/testsuite/cargo_add/build/stdout.log
diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log
diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/change_rename_target/stdout.log b/tests/testsuite/cargo_add/change_rename_target/stdout.log
diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -23,7 +24,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/cyclic_features/stdout.log b/tests/testsuite/cargo_add/cyclic_features/stdout.log
diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/default_features/stdout.log b/tests/testsuite/cargo_add/default_features/stdout.log
diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stdout.log b/tests/testsuite/cargo_add/deprecated_default_features/stdout.log
diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/deprecated_section/stdout.log b/tests/testsuite/cargo_add/deprecated_section/stdout.log
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log
diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/dev/stdout.log b/tests/testsuite/cargo_add/dev/stdout.log
diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stdout.log b/tests/testsuite/cargo_add/dev_build_conflict/stdout.log
diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log
diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/dry_run/stdout.log b/tests/testsuite/cargo_add/dry_run/stdout.log
diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -17,7 +18,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/empty_dep_name/stdout.log b/tests/testsuite/cargo_add/empty_dep_name/stdout.log
diff --git a/tests/testsuite/cargo_add/empty_dep_table/mod.rs b/tests/testsuite/cargo_add/empty_dep_table/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/empty_dep_table/stdout.log b/tests/testsuite/cargo_add/empty_dep_table/stdout.log
diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/features/stdout.log b/tests/testsuite/cargo_add/features/stdout.log
diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use cargo_test_support::Project;
 use itertools::Itertools;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);

diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log b/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log