aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2024-01-25 14:06:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-01-25 14:06:49 +0000
commitdd23ece84a204878d434a6c38fb3fac98cea539a (patch)
tree1ea998f0389423933b34d7b12d84d1db80c561af
parentb865040cde752340f8a5da2917cb97f2050cbff6 (diff)
parent2791929da23290c78d4ce0105bb194d6c32066c5 (diff)
downloadciborium-ll-main.tar.gz
Upgrade ciborium-ll to 0.2.2 am: 2791929da2HEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-ll/+/2925991 Change-Id: I1befdde3836b9a36de57010a2870f31f03015933 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.cargo_vcs_info.json7
-rw-r--r--Android.bp6
-rw-r--r--Cargo.toml11
-rw-r--r--Cargo.toml.orig10
-rw-r--r--METADATA23
-rw-r--r--src/dec.rs2
6 files changed, 29 insertions, 30 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4212810..b19fea3 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
{
"git": {
- "sha1": "7d8f6e499db51fe52f5d3c2ce1d0e0be61c7eaa2"
- }
-}
+ "sha1": "fdf3ec5c53256000f8e12f06c361ca18026a8d99"
+ },
+ "path_in_vcs": "ciborium-ll"
+} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 1dde19a..4e5c582 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,7 @@ rust_test {
host_supported: true,
crate_name: "ciborium_ll",
cargo_env_compat: true,
- cargo_pkg_version: "0.2.1",
+ cargo_pkg_version: "0.2.2",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -43,7 +43,7 @@ rust_library {
host_supported: true,
crate_name: "ciborium_ll",
cargo_env_compat: true,
- cargo_pkg_version: "0.2.1",
+ cargo_pkg_version: "0.2.2",
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
@@ -62,7 +62,7 @@ rust_library_rlib {
name: "libciborium_ll_nostd",
crate_name: "ciborium_ll",
cargo_env_compat: true,
- cargo_pkg_version: "0.2.1",
+ cargo_pkg_version: "0.2.2",
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index 29675d1..80db55e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,9 @@
[package]
edition = "2021"
-rust-version = "1.56"
+rust-version = "1.58"
name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
authors = ["Nathaniel McCallum <npmccallum@profian.com>"]
description = "Low-level CBOR codec primitives"
homepage = "https://github.com/enarx/ciborium"
@@ -25,16 +25,17 @@ repository = "https://github.com/enarx/ciborium"
[package.metadata.docs.rs]
all-features = true
[dependencies.ciborium-io]
-version = "0.2.1"
+version = "0.2.2"
[dependencies.half]
-version = "1.6"
+version = "2.2"
+default-features = false
[dev-dependencies.hex]
version = "0.4"
[features]
alloc = []
-std = ["alloc"]
+std = ["alloc", "half/std"]
[badges.github]
repository = "enarx/ciborium"
workflow = "test"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index a535a94..2722030 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,10 +1,10 @@
[package]
name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
authors = ["Nathaniel McCallum <npmccallum@profian.com>"]
license = "Apache-2.0"
edition = "2021"
-rust-version = "1.56"
+rust-version = "1.58"
homepage = "https://github.com/enarx/ciborium"
repository = "https://github.com/enarx/ciborium"
description = "Low-level CBOR codec primitives"
@@ -21,15 +21,15 @@ is-it-maintained-issue-resolution = { repository = "enarx/ciborium" }
is-it-maintained-open-issues = { repository = "enarx/ciborium" }
[dependencies]
-ciborium-io = { path = "../ciborium-io", version = "0.2.1" }
-half = "1.6"
+ciborium-io = { path = "../ciborium-io", version = "0.2.2" }
+half = { version = "2.2", default-features = false}
[dev-dependencies]
hex = "0.4"
[features]
alloc = []
-std = ["alloc"]
+std = ["alloc", "half/std"]
[package.metadata.docs.rs]
all-features = true
diff --git a/METADATA b/METADATA
index d12bdcc..5f9f6fe 100644
--- a/METADATA
+++ b/METADATA
@@ -1,23 +1,20 @@
# This project was upgraded with external_updater.
# Usage: tools/external_updater/updater.sh update rust/crates/ciborium-ll
-# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
name: "ciborium-ll"
description: "Low-level CBOR codec primitives"
third_party {
- url {
- type: HOMEPAGE
- value: "https://crates.io/crates/ciborium-ll/0.2.0"
- }
- url {
- type: ARCHIVE
- value: "https://static.crates.io/crates/ciborium-ll/ciborium-ll-0.2.1.crate"
- }
- version: "0.2.1"
license_type: NOTICE
last_upgrade_date {
- year: 2023
- month: 6
- day: 14
+ year: 2024
+ month: 1
+ day: 24
+ }
+ homepage: "https://crates.io/crates/ciborium-ll/0.2.0"
+ identifier {
+ type: "Archive"
+ value: "https://static.crates.io/crates/ciborium-ll/ciborium-ll-0.2.2.crate"
+ version: "0.2.2"
}
}
diff --git a/src/dec.rs b/src/dec.rs
index 8329634..3bd0889 100644
--- a/src/dec.rs
+++ b/src/dec.rs
@@ -7,7 +7,7 @@ use ciborium_io::Read;
pub enum Error<T> {
/// An error occurred while reading bytes
///
- /// Contains the underlying error reaturned while reading.
+ /// Contains the underlying error returned while reading.
Io(T),
/// An error occurred while parsing bytes