diff options
| author | Matthew Maurer <mmaurer@google.com> | 2022-09-08 13:04:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-08 13:04:48 +0000 |
| commit | 3c96ba54d5e1af7e6e70c43d59adbe53f75eb93f (patch) | |
| tree | 6154e5607e743b235f92685a4dd22bbdc69e30bd | |
| parent | 264178f914ee15529ea08cb9a9e95fd45b381455 (diff) | |
| parent | 56390471254a8a65084224b6dcbad36b9f491e0a (diff) | |
| download | structopt-derive-3c96ba54d5e1af7e6e70c43d59adbe53f75eb93f.tar.gz | |
Use heck-0.3.3 am: 960abda7c6 am: 8d4f507515 am: 5639047125
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/2209805
Change-Id: Ibcdce76fa5bc0e9ec83a4a2ac0bf7540ee412d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 4 | ||||
| -rw-r--r-- | patches/0001-Use-heck-0.3.3.patch | 30 |
3 files changed, 33 insertions, 3 deletions
@@ -47,7 +47,7 @@ rust_proc_macro { srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ - "libheck", + "libheck_deprecated", "libproc_macro2", "libproc_macro_error", "libquote", diff --git a/cargo2android.json b/cargo2android.json index 341300b..8c8d4d2 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,4 @@ { "run": true, - "tests": true -}
\ No newline at end of file + "patch": "patches/0001-Use-heck-0.3.3.patch" +} diff --git a/patches/0001-Use-heck-0.3.3.patch b/patches/0001-Use-heck-0.3.3.patch new file mode 100644 index 0000000..723e6bd --- /dev/null +++ b/patches/0001-Use-heck-0.3.3.patch @@ -0,0 +1,30 @@ +From bde791c5d4b5744bf060152e37fea18dfc5556ce Mon Sep 17 00:00:00 2001 +From: Matthew Maurer <mmaurer@google.com> +Date: Wed, 7 Sep 2022 16:35:34 -0700 +Subject: [PATCH] Use heck-0.3.3 + +Structopt is EOL and will not update to 0.4 +The plan for migrating off is to delete structopt after migrating +clients to clap + clap-derive + +Change-Id: I091b43aa4200873119af990be9a5d6dd6907a40b +--- + Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Android.bp b/Android.bp +index e008611..9e35e36 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -47,7 +47,7 @@ rust_proc_macro { + srcs: ["src/lib.rs"], + edition: "2018", + rustlibs: [ +- "libheck", ++ "libheck_deprecated", + "libproc_macro2", + "libproc_macro_error", + "libquote", +-- +2.37.2.789.g6183377224-goog + |