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>
---
 .../cargo_init/formats_source/in/rustfmt.toml      |  1 +
 .../testsuite/cargo_init/formats_source/mod.rs     | 29 ++++++++++++++++++++++
 .../cargo_init/formats_source/out/Cargo.toml       |  8 ++++++
 .../cargo_init/formats_source/out/rustfmt.toml     |  1 +
 .../cargo_init/formats_source/out/src/lib.rs       | 14 +++++++++++
 .../testsuite/cargo_init/formats_source/stderr.log |  1 +
 .../testsuite/cargo_init/formats_source/stdout.log |  0
 7 files changed, 54 insertions(+)
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/in/rustfmt.toml
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/mod.rs
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/Cargo.toml
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/rustfmt.toml
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/src/lib.rs
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/stderr.log
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_init/formats_source/stdout.log

(limited to 'src/tools/cargo/tests/testsuite/cargo_init/formats_source')

diff --git a/src/tools/cargo/tests/testsuite/cargo_init/formats_source/in/rustfmt.toml b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/in/rustfmt.toml
new file mode 100644
index 000000000..b196eaa2d
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/in/rustfmt.toml
@@ -0,0 +1 @@
+tab_spaces = 2
diff --git a/src/tools/cargo/tests/testsuite/cargo_init/formats_source/mod.rs b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/mod.rs
new file mode 100644
index 000000000..ac1fb6271
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/mod.rs
@@ -0,0 +1,29 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::prelude::*;
+use cargo_test_support::{process, Project};
+
+use cargo_test_support::curr_dir;
+
+#[cargo_test]
+fn case() {
+    // This cannot use `requires_rustfmt` because rustfmt is not available in
+    // the rust-lang/rust environment. Additionally, if running cargo without
+    // rustup (but with rustup installed), this test also fails due to HOME
+    // preventing the proxy from choosing a toolchain.
+    if let Err(e) = process("rustfmt").arg("-V").exec_with_output() {
+        eprintln!("skipping test, rustfmt not available:\n{e:?}");
+        return;
+    }
+    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/cargo_init/formats_source/out/Cargo.toml b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/Cargo.toml
new file mode 100644
index 000000000..dcdb8da2c
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/Cargo.toml
@@ -0,0 +1,8 @@
+[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/cargo_init/formats_source/out/rustfmt.toml b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/rustfmt.toml
new file mode 100644
index 000000000..b196eaa2d
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/rustfmt.toml
@@ -0,0 +1 @@
+tab_spaces = 2
diff --git a/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/src/lib.rs b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/src/lib.rs
new file mode 100644
index 000000000..3b9acffd5
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/out/src/lib.rs
@@ -0,0 +1,14 @@
+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/cargo_init/formats_source/stderr.log b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/stderr.log
new file mode 100644
index 000000000..f459bf226
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/stderr.log
@@ -0,0 +1 @@
+     Created library package
diff --git a/src/tools/cargo/tests/testsuite/cargo_init/formats_source/stdout.log b/src/tools/cargo/tests/testsuite/cargo_init/formats_source/stdout.log
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3