aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-03-04 06:41:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-04 06:41:04 +0000
commitb5776e2a85e7b8d177e8a6d9d793b0c9794369c7 (patch)
tree13678e7b6988e6a4ab1936a810b08ee72e26e16e
parenta35295cc848c3d5e547981bd1810e5fc377a33ce (diff)
parent10688b17bfc651353a84b1c566ad65b1e825e77c (diff)
downloadclap_lex-b5776e2a85e7b8d177e8a6d9d793b0c9794369c7.tar.gz
Upgrade clap_lex to 0.3.2 am: 463a3baa1e am: e3b00bad65 am: 42e224ac85 am: 10688b17bf
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap_lex/+/2466365 Change-Id: I9938946f9846f81ea4648274d78278639796312c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp4
-rw-r--r--Cargo.toml5
-rw-r--r--Cargo.toml.orig18
-rw-r--r--METADATA15
-rw-r--r--README.md8
-rw-r--r--src/lib.rs6
7 files changed, 26 insertions, 32 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 658595e..661f0be 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "af64699912401443786d84fe040f5d93761300d1"
+ "sha1": "f35ff9167fad5cbc5dda77a950c2259873d59e32"
},
"path_in_vcs": "clap_lex"
} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 93024cf..8ee081b 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_clap_lex_license"],
}
@@ -44,7 +42,7 @@ rust_library {
host_supported: true,
crate_name: "clap_lex",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.0",
+ cargo_pkg_version: "0.3.2",
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index d685925..cf8501c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,9 @@
[package]
edition = "2021"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
name = "clap_lex"
-version = "0.3.0"
+version = "0.3.2"
include = [
"build.rs",
"src/**/*",
@@ -35,7 +35,6 @@ keywords = [
categories = ["command-line-interface"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/clap-rs/clap/tree/master/clap_lex"
-resolver = "2"
[[package.metadata.release.pre-release-replacements]]
file = "CHANGELOG.md"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index e3cc855..d36c307 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "clap_lex"
-version = "0.3.0"
+version = "0.3.2"
description = "Minimal, flexible command line parser"
repository = "https://github.com/clap-rs/clap/tree/master/clap_lex"
categories = ["command-line-interface"]
@@ -11,18 +11,10 @@ keywords = [
"parser",
"parse"
]
-license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.60.0" # MSRV
-include = [
- "build.rs",
- "src/**/*",
- "Cargo.toml",
- "LICENSE*",
- "README.md",
- "benches/**/*",
- "examples/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
[package.metadata.release]
pre-release-replacements = [
diff --git a/METADATA b/METADATA
index c61ab36..bfc9b1d 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/clap_lex
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
name: "clap_lex"
description: "Minimal, flexible command line parser"
third_party {
@@ -7,14 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/clap_lex/clap_lex-0.3.0.crate"
+ value: "https://static.crates.io/crates/clap_lex/clap_lex-0.3.2.crate"
}
- version: "0.3.0"
- # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ version: "0.3.2"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 11
- day: 30
+ year: 2023
+ month: 3
+ day: 2
}
}
diff --git a/README.md b/README.md
index eebd4c5..b353c4a 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,15 @@
[![Crates.io](https://img.shields.io/crates/v/clap_lex?style=flat-square)](https://crates.io/crates/clap_lex)
[![Crates.io](https://img.shields.io/crates/d/clap_lex?style=flat-square)](https://crates.io/crates/clap_lex)
-[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.0/LICENSE-APACHE)
-[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.0/LICENSE-MIT)
+[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.2/LICENSE-APACHE)
+[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.2/LICENSE-MIT)
Dual-licensed under [Apache 2.0](LICENSE-APACHE) or [MIT](LICENSE-MIT).
1. [About](#about)
2. [API Reference](https://docs.rs/clap_lex)
3. [Questions & Discussions](https://github.com/clap-rs/clap/discussions)
-4. [CONTRIBUTING](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.0/clap_lex/CONTRIBUTING.md)
-5. [Sponsors](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.0/README.md#sponsors)
+4. [CONTRIBUTING](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.2/clap_lex/CONTRIBUTING.md)
+5. [Sponsors](https://github.com/clap-rs/clap/blob/clap_lex-v0.3.2/README.md#sponsors)
## About
diff --git a/src/lib.rs b/src/lib.rs
index bc4d4ba..bc9720f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,8 +7,10 @@
//! # Examples
//!
//! ```rust
-//! # use std::path::PathBuf;
-//! # type BoxedError = Box<dyn std::error::Error + Send + Sync>;
+//! use std::path::PathBuf;
+//!
+//! type BoxedError = Box<dyn std::error::Error + Send + Sync>;
+//!
//! #[derive(Debug)]
//! struct Args {
//! paths: Vec<PathBuf>,