Merging upstream version 1.73.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 0 insertions, 37 deletions

diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/in/case.rs b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/in/case.rs
deleted file mode 100644
index f328e4d9d..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/in/case.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() {}
diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/mod.rs b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/mod.rs
deleted file mode 100644
index 59c192cb9..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use cargo_test_support::compare::assert_ui;
-use cargo_test_support::prelude::*;
-use cargo_test_support::Project;
-
-use cargo_test_support::curr_dir;
-
-#[cargo_test]
-fn case() {
-    let project = Project::from_template(curr_dir!().join("in"));
-    let project_root = &project.root();
-
-    snapbox::cmd::Command::cargo_ui()
-        .arg_line("init --lib --vcs none")
-        .current_dir(project_root)
-        .assert()
-        .success()
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
-
-    assert_ui().subset_matches(curr_dir!().join("out"), project_root);
-}
diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml
deleted file mode 100644
index 2c0464468..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "case"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-[lib]
-name = "case"
-path = "case.rs"
diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/case.rs b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/case.rs
deleted file mode 100644
index f328e4d9d..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/case.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() {}
diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stderr.log b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stderr.log
deleted file mode 100644
index bf070e2da..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stderr.log
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: file `case.rs` seems to be a binary (application) file
-     Created library package
diff --git a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stdout.log b/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stdout.log
deleted file mode 100644
index e69de29bb..000000000
--- a/src/tools/cargo/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stdout.log
+++ /dev/null