Snap for 10453563 from e42826f89aed464d3b8555b4ba6755d599116c31 to mainline-permission-release
Change-Id: I28f5df587b34a280d1d5fa9ab6e07d85d61680d0
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 116e262..18c719f 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "f1f85d2d89cbe09314dc1b59e581b8a43531cf3e"
+ "sha1": "3f3c29726a21c4b541bb2b9aa2c592461897ded0"
},
"path_in_vcs": "argh_shared"
}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 4d0ad6b..e82a725 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: ["external_rust_crates_argh_shared_license"],
}
@@ -25,11 +23,13 @@
host_supported: true,
crate_name: "argh_shared",
cargo_env_compat: true,
- cargo_pkg_version: "0.1.7",
+ cargo_pkg_version: "0.1.10",
srcs: ["src/lib.rs"],
edition: "2018",
apex_available: [
"//apex_available:platform",
"com.android.virt",
],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/Cargo.toml b/Cargo.toml
index d54a07f..6dd113e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,12 @@
[package]
edition = "2018"
name = "argh_shared"
-version = "0.1.7"
-authors = ["Taylor Cramer <cramertj@google.com>", "Benjamin Brittain <bwb@google.com>", "Erick Tryzelaar <etryzelaar@google.com>"]
+version = "0.1.10"
+authors = [
+ "Taylor Cramer <cramertj@google.com>",
+ "Benjamin Brittain <bwb@google.com>",
+ "Erick Tryzelaar <etryzelaar@google.com>",
+]
description = "Derive-based argument parsing optimized for code size"
readme = "README.md"
license = "BSD-3-Clause"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 1f7e694..0f4478a 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "argh_shared"
-version = "0.1.7"
+version = "0.1.10"
authors = ["Taylor Cramer <cramertj@google.com>", "Benjamin Brittain <bwb@google.com>", "Erick Tryzelaar <etryzelaar@google.com>"]
edition = "2018"
license = "BSD-3-Clause"
diff --git a/METADATA b/METADATA
index e3c64c5..0e881d1 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/argh_shared
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
name: "argh_shared"
description: "Derive-based argument parsing optimized for code size"
third_party {
@@ -7,13 +11,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/argh_shared/argh_shared-0.1.7.crate"
+ value: "https://static.crates.io/crates/argh_shared/argh_shared-0.1.10.crate"
}
- version: "0.1.7"
+ version: "0.1.10"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 1
- day: 13
+ year: 2023
+ month: 2
+ day: 1
}
}
diff --git a/README.md b/README.md
index 4e949e4..7368162 100644
--- a/README.md
+++ b/README.md
@@ -175,3 +175,16 @@
```
NOTE: This is not an officially supported Google product.
+
+
+## How to debug the expanded derive macro for `argh`
+
+The `argh::FromArgs` derive macro can be debugged with the [cargo-expand](https://crates.io/crates/cargo-expand) crate.
+
+### Expand the derive macro in `examples/simple_example.rs`
+
+See [argh/examples/simple_example.rs](./argh/examples/simple_example.rs) for the example struct we wish to expand.
+
+First, install `cargo-expand` by running `cargo install cargo-expand`. Note this requires the nightly build of Rust.
+
+Once installed, run `cargo expand` with in the `argh` package and you can see the expanded code.
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5cbb502..9f55024 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,6 +3,9 @@
"imports": [
{
"path": "external/rust/crates/argh"
+ },
+ {
+ "path": "packages/modules/Virtualization/virtualizationmanager"
}
]
}
