aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-02-03 20:10:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-03 20:10:06 +0000
commitd3bb4bee34055bb837ef8e2a8127b626c2b8e194 (patch)
tree0961394199dda09c215c409fb509bc2a14f3ffe9
parent3ef192eee302738a5222179ce6d6be12708b5ce0 (diff)
parentdc709121bce85b5e2e53bb278033a4e0e3d4011d (diff)
downloadpaste-d3bb4bee34055bb837ef8e2a8127b626c2b8e194.tar.gz
Upgrade paste to 1.0.11 am: c31abd77c4 am: f1296a58fd am: dc709121bc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/paste/+/2419085 Change-Id: I9aadeae12e53436c7f3656dd85a9b0b56df3537a 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.bp2
-rw-r--r--Cargo.toml2
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA10
-rw-r--r--README.md2
6 files changed, 10 insertions, 10 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 1a328e4..a26ab5a 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "188ceccacedd20ff9ecc4037d43162f39a41f7bf"
+ "sha1": "44d758d558c62bf08bfdef49159f30fe37a8c101"
},
"path_in_vcs": ""
} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 10f9992..6393c3a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,7 @@ rust_proc_macro {
name: "libpaste",
crate_name: "paste",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.10",
+ cargo_pkg_version: "1.0.11",
srcs: ["src/lib.rs"],
edition: "2018",
}
diff --git a/Cargo.toml b/Cargo.toml
index bedfc6e..091af69 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2018"
rust-version = "1.31"
name = "paste"
-version = "1.0.10"
+version = "1.0.11"
authors = ["David Tolnay <dtolnay@gmail.com>"]
description = "Macros for all your token pasting needs"
readme = "README.md"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index bbd510c..179c506 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "paste"
-version = "1.0.10"
+version = "1.0.11"
authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["development-tools", "no-std"]
description = "Macros for all your token pasting needs"
diff --git a/METADATA b/METADATA
index 0b250e2..665788d 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/paste/paste-1.0.10.crate"
+ value: "https://static.crates.io/crates/paste/paste-1.0.11.crate"
}
- version: "1.0.10"
+ version: "1.0.11"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 12
- day: 13
+ year: 2023
+ month: 2
+ day: 3
}
}
diff --git a/README.md b/README.md
index 30fce1b..c32d424 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Macros for all your token pasting needs
[<img alt="github" src="https://img.shields.io/badge/github-dtolnay/paste-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/paste)
[<img alt="crates.io" src="https://img.shields.io/crates/v/paste.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/paste)
[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-paste-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs" height="20">](https://docs.rs/paste)
-[<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/paste/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/paste/actions?query=branch%3Amaster)
+[<img alt="build status" src="https://img.shields.io/github/actions/workflow/status/dtolnay/paste/ci.yml?branch=master&style=for-the-badge" height="20">](https://github.com/dtolnay/paste/actions?query=branch%3Amaster)
The nightly-only [`concat_idents!`] macro in the Rust standard library is
notoriously underpowered in that its concatenated identifiers can only refer to