From d1b2d29528b7794b41e66fc2136e395a02f8529b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 30 May 2024 05:59:35 +0200
Subject: Merging upstream version 1.73.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../init/pijul_autodetect/in/.pijul/.keep          |  0
 .../tests/testsuite/init/pijul_autodetect/mod.rs   | 22 ----------------------
 .../testsuite/init/pijul_autodetect/out/.ignore    |  2 --
 .../testsuite/init/pijul_autodetect/out/Cargo.toml |  8 --------
 .../testsuite/init/pijul_autodetect/out/src/lib.rs | 14 --------------
 .../testsuite/init/pijul_autodetect/stderr.log     |  1 -
 .../testsuite/init/pijul_autodetect/stdout.log     |  0
 7 files changed, 47 deletions(-)
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/in/.pijul/.keep
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/mod.rs
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/.ignore
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/Cargo.toml
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/stderr.log
 delete mode 100644 src/tools/cargo/tests/testsuite/init/pijul_autodetect/stdout.log

(limited to 'src/tools/cargo/tests/testsuite/init/pijul_autodetect')

diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/in/.pijul/.keep b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/in/.pijul/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/mod.rs b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/mod.rs
deleted file mode 100644
index d45ba868a..000000000
--- a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/mod.rs
+++ /dev/null
@@ -1,22 +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")
-        .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);
-    assert!(!project_root.join(".git").is_dir());
-}
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/.ignore b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/.ignore
deleted file mode 100644
index 4fffb2f89..000000000
--- a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/.ignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/Cargo.lock
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/Cargo.toml b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/Cargo.toml
deleted file mode 100644
index dcdb8da2c..000000000
--- a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/Cargo.toml
+++ /dev/null
@@ -1,8 +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]
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/src/lib.rs b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
deleted file mode 100644
index 7d12d9af8..000000000
--- a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/stderr.log b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/stderr.log
deleted file mode 100644
index f459bf226..000000000
--- a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/stderr.log
+++ /dev/null
@@ -1 +0,0 @@
-     Created library package
diff --git a/src/tools/cargo/tests/testsuite/init/pijul_autodetect/stdout.log b/src/tools/cargo/tests/testsuite/init/pijul_autodetect/stdout.log
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3