From 08c149b73f29f255f3b90178f9fe50838829593f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 26 Mar 2024 17:41:08 +0100
Subject: [PATCH] rename our proc-macro test crate to a more clear name

and remove serde_derive, since the --extern .so file was really just a consequence of building a proc macro
---
 src/tools/miri/test-cargo-miri/Cargo.lock     | 35 ++-----------------
 src/tools/miri/test-cargo-miri/Cargo.toml     |  7 ++--
 .../test-cargo-miri/issue-1760/Cargo.toml     |  8 -----
 .../proc-macro-crate/Cargo.toml               | 13 +++++++
 .../{issue-1760 => proc-macro-crate}/build.rs |  0
 .../src/lib.rs                                |  0
 src/tools/miri/test-cargo-miri/src/lib.rs     |  2 +-
 7 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100644 src/tools/miri/test-cargo-miri/issue-1760/Cargo.toml
 create mode 100644 src/tools/miri/test-cargo-miri/proc-macro-crate/Cargo.toml
 rename src/tools/miri/test-cargo-miri/{issue-1760 => proc-macro-crate}/build.rs (100%)
 rename src/tools/miri/test-cargo-miri/{issue-1760 => proc-macro-crate}/src/lib.rs (100%)

diff --git a/src/tools/miri/test-cargo-miri/Cargo.lock b/src/tools/miri/test-cargo-miri/Cargo.lock
index 4e962f6c7687..a3cd2aa35fea 100644
--- a/src/tools/miri/test-cargo-miri/Cargo.lock
+++ b/src/tools/miri/test-cargo-miri/Cargo.lock
@@ -33,10 +33,9 @@ dependencies = [
  "issue_1567",
  "issue_1691",
  "issue_1705",
- "issue_1760",
  "issue_rust_86261",
  "proc-macro2",
- "serde_derive",
+ "proc_macro_crate",
 ]
 
 [[package]]
@@ -91,10 +90,6 @@ dependencies = [
  "byteorder 1.4.3",
 ]
 
-[[package]]
-name = "issue_1760"
-version = "0.1.0"
-
 [[package]]
 name = "issue_rust_86261"
 version = "0.1.0"
@@ -115,25 +110,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+name = "proc_macro_crate"
+version = "0.1.0"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "serde_derive"
-version = "1.0.185"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "subcrate"
 version = "0.1.0"
@@ -141,17 +123,6 @@ dependencies = [
  "byteorder 1.4.3",
 ]
 
-[[package]]
-name = "syn"
-version = "2.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.6"
diff --git a/src/tools/miri/test-cargo-miri/Cargo.toml b/src/tools/miri/test-cargo-miri/Cargo.toml
index 64ccb5ae0069..bfef388669d1 100644
--- a/src/tools/miri/test-cargo-miri/Cargo.toml
+++ b/src/tools/miri/test-cargo-miri/Cargo.toml
@@ -12,20 +12,19 @@ edition = "2018"
 byteorder = "1.0"
 cdylib = { path = "cdylib" }
 exported_symbol = { path = "exported-symbol" }
+proc_macro_crate = { path = "proc-macro-crate" }
 issue_1567 = { path = "issue-1567" }
 issue_1691 = { path = "issue-1691" }
 issue_1705 = { path = "issue-1705" }
-issue_1760 = { path = "issue-1760" }
 issue_rust_86261 = { path = "issue-rust-86261" }
 
 [dev-dependencies]
 byteorder_2 = { package = "byteorder", version = "0.5" } # to test dev-dependencies behave as expected, with renaming
 ## More dependencies that we don't actually use, but add just for extra test coverage.
-# Exercises some unique code path (`--extern` .so file).
-serde_derive = "1.0.185"
 # These use custom build probes, let's make sure they don't explode.
 # (Ideally we'd check if the probe was successful, but that's not easily possible.)
-# proc-macro2 is extra exciting because it is both a host-dependency and a target-dependency.
+# proc-macro2 is extra exciting because it is both a host-dependency (of proc_macro_crate above)
+# and a target-dependency.
 proc-macro2 = "1.0"
 eyre = "0.6"
 
diff --git a/src/tools/miri/test-cargo-miri/issue-1760/Cargo.toml b/src/tools/miri/test-cargo-miri/issue-1760/Cargo.toml
deleted file mode 100644
index 80925c747463..000000000000
--- a/src/tools/miri/test-cargo-miri/issue-1760/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "issue_1760"
-version = "0.1.0"
-authors = ["Miri Team"]
-edition = "2018"
-
-[lib]
-proc-macro = true
diff --git a/src/tools/miri/test-cargo-miri/proc-macro-crate/Cargo.toml b/src/tools/miri/test-cargo-miri/proc-macro-crate/Cargo.toml
new file mode 100644
index 000000000000..89652f9b0428
--- /dev/null
+++ b/src/tools/miri/test-cargo-miri/proc-macro-crate/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+# regression test for issue 1760
+name = "proc_macro_crate"
+version = "0.1.0"
+authors = ["Miri Team"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+# A common dependency of proc macros, let's make sure that works.
+proc-macro2 = "1.0"
diff --git a/src/tools/miri/test-cargo-miri/issue-1760/build.rs b/src/tools/miri/test-cargo-miri/proc-macro-crate/build.rs
similarity index 100%
rename from src/tools/miri/test-cargo-miri/issue-1760/build.rs
rename to src/tools/miri/test-cargo-miri/proc-macro-crate/build.rs
diff --git a/src/tools/miri/test-cargo-miri/issue-1760/src/lib.rs b/src/tools/miri/test-cargo-miri/proc-macro-crate/src/lib.rs
similarity index 100%
rename from src/tools/miri/test-cargo-miri/issue-1760/src/lib.rs
rename to src/tools/miri/test-cargo-miri/proc-macro-crate/src/lib.rs
diff --git a/src/tools/miri/test-cargo-miri/src/lib.rs b/src/tools/miri/test-cargo-miri/src/lib.rs
index e6b8c4ef65b2..003341d0974c 100644
--- a/src/tools/miri/test-cargo-miri/src/lib.rs
+++ b/src/tools/miri/test-cargo-miri/src/lib.rs
@@ -28,9 +28,9 @@
 /// ```
 #[no_mangle]
 pub fn make_true() -> bool {
+    proc_macro_crate::use_the_dependency!();
     issue_1567::use_the_dependency();
     issue_1705::use_the_dependency();
-    issue_1760::use_the_dependency!();
     issue_1691::use_me()
 }