From da407a5000da8fce18b8d506880075b37e33f83b Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 3 Feb 2021 21:17:11 +1000
Subject: [PATCH] pin proc_macro_nested due to Windows breakage

---
 Cargo.lock                                             |  5 +++--
 cargo/crates.bzl                                       | 10 +++++-----
 cargo/licenses.json                                    |  2 +-
 cargo/remote/BUILD.futures-util-0.3.12.bazel           |  2 +-
 ...0.1.7.bazel => BUILD.proc-macro-nested-0.1.6.bazel} |  4 ++--
 rslib/Cargo.toml                                       |  4 ++++
 rslib/cargo/BUILD.bazel                                |  9 +++++++++
 7 files changed, 25 insertions(+), 11 deletions(-)
 rename cargo/remote/{BUILD.proc-macro-nested-0.1.7.bazel => BUILD.proc-macro-nested-0.1.6.bazel} (97%)

diff --git a/Cargo.lock b/Cargo.lock
index 8d0417a2a..833bcc1c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,6 +58,7 @@ dependencies = [
  "num_enum",
  "once_cell",
  "pin-project 1.0.4",
+ "proc-macro-nested",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -1521,9 +1522,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
 
 [[package]]
 name = "proc-macro2"
diff --git a/cargo/crates.bzl b/cargo/crates.bzl
index a23f7b2b6..8d0f493a3 100644
--- a/cargo/crates.bzl
+++ b/cargo/crates.bzl
@@ -1593,12 +1593,12 @@ def raze_fetch_remote_crates():
 
     maybe(
         http_archive,
-        name = "raze__proc_macro_nested__0_1_7",
-        url = "https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download",
+        name = "raze__proc_macro_nested__0_1_6",
+        url = "https://crates.io/api/v1/crates/proc-macro-nested/0.1.6/download",
         type = "tar.gz",
-        sha256 = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086",
-        strip_prefix = "proc-macro-nested-0.1.7",
-        build_file = Label("//cargo/remote:BUILD.proc-macro-nested-0.1.7.bazel"),
+        sha256 = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a",
+        strip_prefix = "proc-macro-nested-0.1.6",
+        build_file = Label("//cargo/remote:BUILD.proc-macro-nested-0.1.6.bazel"),
     )
 
     maybe(
diff --git a/cargo/licenses.json b/cargo/licenses.json
index 76389815c..0022b7305 100644
--- a/cargo/licenses.json
+++ b/cargo/licenses.json
@@ -1441,7 +1441,7 @@
   },
   {
     "name": "proc-macro-nested",
-    "version": "0.1.7",
+    "version": "0.1.6",
     "authors": "David Tolnay <dtolnay@gmail.com>",
     "repository": "https://github.com/dtolnay/proc-macro-hack",
     "license": "Apache-2.0 OR MIT",
diff --git a/cargo/remote/BUILD.futures-util-0.3.12.bazel b/cargo/remote/BUILD.futures-util-0.3.12.bazel
index 9aee9984f..62f5c217d 100644
--- a/cargo/remote/BUILD.futures-util-0.3.12.bazel
+++ b/cargo/remote/BUILD.futures-util-0.3.12.bazel
@@ -79,7 +79,7 @@ rust_library(
         "@raze__memchr__2_3_4//:memchr",
         "@raze__pin_project_lite__0_2_4//:pin_project_lite",
         "@raze__pin_utils__0_1_0//:pin_utils",
-        "@raze__proc_macro_nested__0_1_7//:proc_macro_nested",
+        "@raze__proc_macro_nested__0_1_6//:proc_macro_nested",
         "@raze__slab__0_4_2//:slab",
     ],
 )
diff --git a/cargo/remote/BUILD.proc-macro-nested-0.1.7.bazel b/cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
similarity index 97%
rename from cargo/remote/BUILD.proc-macro-nested-0.1.7.bazel
rename to cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
index 20d6dae23..e901b7d9b 100644
--- a/cargo/remote/BUILD.proc-macro-nested-0.1.7.bazel
+++ b/cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
@@ -52,7 +52,7 @@ cargo_build_script(
         "cargo-raze",
         "manual",
     ],
-    version = "0.1.7",
+    version = "0.1.6",
     visibility = ["//visibility:private"],
     deps = [
     ],
@@ -74,7 +74,7 @@ rust_library(
         "cargo-raze",
         "manual",
     ],
-    version = "0.1.7",
+    version = "0.1.6",
     # buildifier: leave-alone
     deps = [
         ":proc_macro_nested_build_script",
diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml
index 483ab539f..68730aaa7 100644
--- a/rslib/Cargo.toml
+++ b/rslib/Cargo.toml
@@ -75,3 +75,7 @@ unicode-normalization = "0.1.13"
 utime = "0.3.1"
 zip = { version = "0.5.6", default-features = false, features = ["deflate", "time"] }
 async-trait = "0.1.42"
+
+# transitive dependency; 0.1.7 is currently broken on Windows (perhaps
+# only in Bazel)
+proc-macro-nested = "=0.1.6"
diff --git a/rslib/cargo/BUILD.bazel b/rslib/cargo/BUILD.bazel
index aaebe38bd..ba0b95e70 100644
--- a/rslib/cargo/BUILD.bazel
+++ b/rslib/cargo/BUILD.bazel
@@ -228,6 +228,15 @@ alias(
     ],
 )
 
+alias(
+    name = "proc_macro_nested",
+    actual = "@raze__proc_macro_nested__0_1_6//:proc_macro_nested",
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+)
+
 alias(
     name = "prost",
     actual = "@raze__prost__0_7_0//:prost",