Merging upstream version 1.72.1+dfsg1.

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

5 files changed, 0 insertions, 46 deletions

diff --git a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/in b/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/in
deleted file mode 120000
index 6c6a27fcf..000000000
--- a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/in
+++ /dev/null
@@ -1 +0,0 @@
-../add-basic.in
\ No newline at end of file
diff --git a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/mod.rs b/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/mod.rs
deleted file mode 100644
index 705182f20..000000000
--- a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/mod.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use cargo_test_support::compare::assert_ui;
-use cargo_test_support::prelude::*;
-use cargo_test_support::Project;
-
-use crate::cargo_add::init_registry;
-use cargo_test_support::curr_dir;
-
-#[cargo_test]
-fn case() {
-    init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
-    let project_root = project.root();
-    let cwd = &project_root;
-    let git_url = url::Url::from_directory_path(cwd.join("does-not-exist"))
-        .unwrap()
-        .to_string();
-
-    snapbox::cmd::Command::cargo_ui()
-        .arg("add")
-        .args(["fake-git", "--git", &git_url])
-        .current_dir(cwd)
-        .assert()
-        .code(101)
-        .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/cargo_add/invalid_git_external/out/Cargo.toml b/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/out/Cargo.toml
deleted file mode 100644
index 3ecdb6681..000000000
--- a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/out/Cargo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[workspace]
-
-[package]
-name = "cargo-list-test-fixture"
-version = "0.0.0"
diff --git a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stderr.log b/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stderr.log
deleted file mode 100644
index 18656300b..000000000
--- a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stderr.log
+++ /dev/null
@@ -1,12 +0,0 @@
-    Updating git repository `[ROOTURL]/case/does-not-exist/`
-...
-error: failed to load source for dependency `fake-git`
-
-Caused by:
-  Unable to update [ROOTURL]/case/does-not-exist/
-
-Caused by:
-  failed to clone into: [ROOT]/home/.cargo/git/db/does-not-exist-[..]
-
-Caused by:
-...
diff --git a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stdout.log b/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stdout.log
deleted file mode 100644
index e69de29bb..000000000
--- a/src/tools/cargo/tests/testsuite/cargo_add/invalid_git_external/stdout.log
+++ /dev/null