From 231688fc71cd46d810b2a62c30f4c3640b3ecebf Mon Sep 17 00:00:00 2001
From: Timo Tiuraniemi <timo.tiuraniemi@iki.fi>
Date: Sat, 19 Aug 2023 11:44:34 +0300
Subject: [PATCH] Use proper way to demostrate bug

---
 .../crate_universe_failure/WORKSPACE.bazel    |  9 +-
 .../serde_derive/BUILD.bazel                  |  3 +-
 .../serde_derive/Cargo.lock                   | 18 ++--
 .../serde_derive/Cargo.toml                   |  7 --
 .../serde_derive/cargo-bazel-lock.json        | 82 ++++++++++---------
 .../serde_derive/src/main.rs                  |  2 +-
 6 files changed, 61 insertions(+), 60 deletions(-)
 delete mode 100644 examples/crate_universe_failure/serde_derive/Cargo.toml

diff --git a/examples/crate_universe_failure/WORKSPACE.bazel b/examples/crate_universe_failure/WORKSPACE.bazel
index 2ac6997b78..26f9fc2ad8 100644
--- a/examples/crate_universe_failure/WORKSPACE.bazel
+++ b/examples/crate_universe_failure/WORKSPACE.bazel
@@ -17,7 +17,7 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie
 
 crate_universe_dependencies(bootstrap = True)
 
-load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
+load("@rules_rust//crate_universe:defs.bzl", "crate", "crates_repository")
 
 ##############################
 ##
@@ -92,9 +92,10 @@ crates_repository(
     cargo_lockfile = "//serde_derive:Cargo.lock",
     generator = "@cargo_bazel_bootstrap//:cargo-bazel",
     lockfile = "//serde_derive:cargo-bazel-lock.json",
-    manifests = [
-        "//serde_derive:Cargo.toml",
-    ],
+    packages = {
+        "serde": crate.spec(version = "1.0.183"),
+        "serde_derive": crate.spec(version = "1.0.183"),
+    },
 )
 
 load(
diff --git a/examples/crate_universe_failure/serde_derive/BUILD.bazel b/examples/crate_universe_failure/serde_derive/BUILD.bazel
index f6e1d6a77b..187c47ef9a 100644
--- a/examples/crate_universe_failure/serde_derive/BUILD.bazel
+++ b/examples/crate_universe_failure/serde_derive/BUILD.bazel
@@ -8,5 +8,6 @@ rust_binary(
     srcs = [
         "src/main.rs",
     ],
-    deps = all_crate_deps(),
+    proc_macro_deps = ["@crate_index_serde_derive//:serde_derive"],
+    deps = ["@crate_index_serde_derive//:serde"],
 )
diff --git a/examples/crate_universe_failure/serde_derive/Cargo.lock b/examples/crate_universe_failure/serde_derive/Cargo.lock
index 2395e05802..2eab0debb8 100644
--- a/examples/crate_universe_failure/serde_derive/Cargo.lock
+++ b/examples/crate_universe_failure/serde_derive/Cargo.lock
@@ -2,6 +2,14 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "direct-cargo-bazel-deps"
+version = "0.0.1"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.66"
@@ -25,9 +33,6 @@ name = "serde"
 version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
-dependencies = [
- "serde_derive",
-]
 
 [[package]]
 name = "serde_derive"
@@ -40,13 +45,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_derive_failure"
-version = "0.0.1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.29"
diff --git a/examples/crate_universe_failure/serde_derive/Cargo.toml b/examples/crate_universe_failure/serde_derive/Cargo.toml
deleted file mode 100644
index 25f7bfaa7b..0000000000
--- a/examples/crate_universe_failure/serde_derive/Cargo.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "serde_derive_failure"
-version = "0.0.1"
-edition = "2021"
-
-[dependencies]
-serde = { version = "1.0.183", features = ["derive"] }
diff --git a/examples/crate_universe_failure/serde_derive/cargo-bazel-lock.json b/examples/crate_universe_failure/serde_derive/cargo-bazel-lock.json
index 8de16b523e..acbc2b102d 100644
--- a/examples/crate_universe_failure/serde_derive/cargo-bazel-lock.json
+++ b/examples/crate_universe_failure/serde_derive/cargo-bazel-lock.json
@@ -1,6 +1,49 @@
 {
-  "checksum": "7370f3142805b71780b26969979cf0e9f1760af0a58722285fda7c94c4d8a656",
+  "checksum": "f00f8823d850778984ba3b5342acf4aa3b26e25db21e8fb09d6f691096362e2a",
   "crates": {
+    "direct-cargo-bazel-deps 0.0.1": {
+      "name": "direct-cargo-bazel-deps",
+      "version": "0.0.1",
+      "repository": null,
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "direct_cargo_bazel_deps",
+            "crate_root": ".direct_cargo_bazel_deps.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        }
+      ],
+      "library_target_name": "direct_cargo_bazel_deps",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "deps": {
+          "common": [
+            {
+              "id": "serde 1.0.183",
+              "target": "serde"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2018",
+        "proc_macro_deps": {
+          "common": [
+            {
+              "id": "serde_derive 1.0.183",
+              "target": "serde_derive"
+            }
+          ],
+          "selects": {}
+        },
+        "version": "0.0.1"
+      },
+      "license": null
+    },
     "proc-macro2 1.0.66": {
       "name": "proc-macro2",
       "version": "1.0.66",
@@ -148,8 +191,6 @@
         "crate_features": {
           "common": [
             "default",
-            "derive",
-            "serde_derive",
             "std"
           ],
           "selects": {}
@@ -164,15 +205,6 @@
           "selects": {}
         },
         "edition": "2018",
-        "proc_macro_deps": {
-          "common": [
-            {
-              "id": "serde_derive 1.0.183",
-              "target": "serde_derive"
-            }
-          ],
-          "selects": {}
-        },
         "version": "1.0.183"
       },
       "build_script_attrs": {
@@ -237,30 +269,6 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "serde_derive_failure 0.0.1": {
-      "name": "serde_derive_failure",
-      "version": "0.0.1",
-      "repository": null,
-      "targets": [],
-      "library_target_name": null,
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "deps": {
-          "common": [
-            {
-              "id": "serde 1.0.183",
-              "target": "serde"
-            }
-          ],
-          "selects": {}
-        },
-        "edition": "2021",
-        "version": "0.0.1"
-      },
-      "license": null
-    },
     "syn 2.0.29": {
       "name": "syn",
       "version": "2.0.29",
@@ -353,7 +361,7 @@
   },
   "binary_crates": [],
   "workspace_members": {
-    "serde_derive_failure 0.0.1": "serde_derive"
+    "direct-cargo-bazel-deps 0.0.1": ""
   },
   "conditions": {
     "cfg(not(all(target_arch = \"x86_64\", target_os = \"linux\", target_env = \"gnu\")))": [
diff --git a/examples/crate_universe_failure/serde_derive/src/main.rs b/examples/crate_universe_failure/serde_derive/src/main.rs
index 9d88edfe2a..c502f813a9 100644
--- a/examples/crate_universe_failure/serde_derive/src/main.rs
+++ b/examples/crate_universe_failure/serde_derive/src/main.rs
@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {