aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-03-04 06:43:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-04 06:43:50 +0000
commitdb15cc50b2b2bccb0e7f26a6dba612d2ab480690 (patch)
tree9fe26166fc939c4ca5ac18852d73fb0e22004f69
parentbcc86e8f738eb643f379debeb7854caf960193a6 (diff)
parent4f1b60fcc3226355280f68db6e85fceec133f7f2 (diff)
downloadbstr-db15cc50b2b2bccb0e7f26a6dba612d2ab480690.tar.gz
Upgrade bstr to 1.3.0 am: b3a08ad120 am: f4edb8b7b3 am: 5de37e44eb am: 4f1b60fcc3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bstr/+/2467480 Change-Id: Ie8c13e3a046c365fb64b885a1d9560af159a0d46 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--METADATA8
-rw-r--r--src/impls.rs7
6 files changed, 15 insertions, 8 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 117fa04..ff424fa 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "65993b58be1547bfc0de9ad8c1c8f3d3fcb0a32f"
+ "sha1": "f72910a192f37e85932211bef957fbadaecefbaf"
},
"path_in_vcs": ""
} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 567b12b..1ca78fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,7 +44,7 @@ rust_library {
host_supported: true,
crate_name: "bstr",
cargo_env_compat: true,
- cargo_pkg_version: "1.2.0",
+ cargo_pkg_version: "1.3.0",
srcs: ["src/lib.rs"],
edition: "2021",
features: [
diff --git a/Cargo.toml b/Cargo.toml
index b74217b..135bd38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.60"
name = "bstr"
-version = "1.2.0"
+version = "1.3.0"
authors = ["Andrew Gallant <jamslam@gmail.com>"]
exclude = ["/.github"]
description = "A string type that is not required to be valid UTF-8."
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index bdfa0b7..ef559d7 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "bstr"
-version = "1.2.0" #:version
+version = "1.3.0" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = "A string type that is not required to be valid UTF-8."
documentation = "https://docs.rs/bstr"
diff --git a/METADATA b/METADATA
index c21ad25..587f058 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/bstr/bstr-1.2.0.crate"
+ value: "https://static.crates.io/crates/bstr/bstr-1.3.0.crate"
}
- version: "1.2.0"
+ version: "1.3.0"
license_type: NOTICE
last_upgrade_date {
year: 2023
- month: 2
- day: 15
+ month: 3
+ day: 2
}
}
diff --git a/src/impls.rs b/src/impls.rs
index 7ae4510..c063cb6 100644
--- a/src/impls.rs
+++ b/src/impls.rs
@@ -563,6 +563,13 @@ mod bstr {
}
}
+ impl AsRef<BStr> for BStr {
+ #[inline]
+ fn as_ref(&self) -> &BStr {
+ self
+ }
+ }
+
impl AsRef<BStr> for [u8] {
#[inline]
fn as_ref(&self) -> &BStr {