diff options
author | David LeGare <legare@google.com> | 2022-06-28 22:32:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-28 22:32:54 +0000 |
commit | 69a7404429e3a8f81dedc7c28a60a08a4a938137 (patch) | |
tree | 32d246606435087f592e87b30816d35bde174173 | |
parent | 08aec08e36a82beac7c4afe29377256aeeeb1642 (diff) | |
parent | a9526c95bb2e1f5bcdd8b2ef555e921269266d70 (diff) | |
download | combine-69a7404429e3a8f81dedc7c28a60a08a4a938137.tar.gz |
Upgrade rust/crates/combine to 4.6.4 am: 2cc9078f26 am: 60c273cb2a am: 8c290ee734 am: 3f40ec5730 am: a9526c95bb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/2137716
Change-Id: I53e541765e1d01b8c515e4daacec0a92ee54a53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | Cargo.lock | 6 | ||||
-rw-r--r-- | Cargo.toml | 99 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | benches/http.rs | 2 | ||||
-rw-r--r-- | src/stream/mod.rs | 2 |
9 files changed, 103 insertions, 28 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index bce2fd1..458621b 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "84ceb76d89f267dcffe2802b336f88b451cdc01f" + "sha1": "50a71afa1c88e8564e0220a6e0625dd16a2302a2" }, "path_in_vcs": "" }
\ No newline at end of file @@ -24,7 +24,7 @@ rust_library { host_supported: true, crate_name: "combine", cargo_env_compat: true, - cargo_pkg_version: "4.6.3", + cargo_pkg_version: "4.6.4", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fbf5f4..2beecf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +<a name="v4.6.4"></a> +### v4.6.4 (2022-04-25) + + + + <a name="v4.6.3"></a> ### v4.6.3 (2022-01-12) @@ -257,7 +257,7 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.3" +version = "4.6.4" dependencies = [ "async-std", "bytes 0.5.6", @@ -1204,9 +1204,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1" dependencies = [ "bytes 1.1.0", "futures-core", @@ -12,18 +12,31 @@ [package] edition = "2018" name = "combine" -version = "4.6.3" +version = "4.6.4" authors = ["Markus Westerlind <marwes91@gmail.com>"] description = "Fast parser combinators on arbitrary streams with zero-copy support." documentation = "https://docs.rs/combine" readme = "README.md" -keywords = ["parser", "parsing", "combinators", "ll"] -categories = ["parsing", "no-std"] +keywords = [ + "parser", + "parsing", + "combinators", + "ll", +] +categories = [ + "parsing", + "no-std", +] license = "MIT" repository = "https://github.com/Marwes/combine" + [package.metadata.docs.rs] all-features = true -rustdoc-args = ["--cfg", "docsrs"] +rustdoc-args = [ + "--cfg", + "docsrs", +] + [profile.bench] lto = true codegen-units = 1 @@ -34,7 +47,10 @@ path = "src/lib.rs" [[example]] name = "async" -required-features = ["std", "tokio"] +required-features = [ + "std", + "tokio", +] [[example]] name = "date" @@ -50,7 +66,10 @@ name = "ini" [[test]] name = "async" -required-features = ["tokio-02", "futures-io-03"] +required-features = [ + "tokio-02", + "futures-io-03", +] [[bench]] name = "json" @@ -66,6 +85,7 @@ required-features = ["std"] name = "mp4" harness = false required-features = ["mp4"] + [dependencies.bytes] version = "1" optional = true @@ -119,10 +139,11 @@ default-features = false package = "tokio" [dependencies.tokio-util] -version = "0.6" +version = "0.7" features = ["codec"] optional = true default-features = false + [dev-dependencies.async-std] version = "1" @@ -146,7 +167,10 @@ version = "1.0" [dev-dependencies.partial-io] version = "0.3" -features = ["tokio", "quickcheck"] +features = [ + "tokio", + "quickcheck", +] [dev-dependencies.quick-error] version = "1.0" @@ -156,26 +180,69 @@ version = "0.6" [dev-dependencies.tokio-02-dep] version = "0.2" -features = ["fs", "io-driver", "io-util", "macros"] +features = [ + "fs", + "io-driver", + "io-util", + "macros", +] package = "tokio" [dev-dependencies.tokio-03-dep] version = "0.3" -features = ["fs", "macros", "rt-multi-thread"] +features = [ + "fs", + "macros", + "rt-multi-thread", +] package = "tokio" [dev-dependencies.tokio-dep] version = "1" -features = ["fs", "macros", "rt", "rt-multi-thread", "io-util"] +features = [ + "fs", + "macros", + "rt", + "rt-multi-thread", + "io-util", +] package = "tokio" [features] alloc = [] default = ["std"] -futures-03 = ["pin-project", "std", "futures-core-03", "futures-io-03", "pin-project-lite"] +futures-03 = [ + "pin-project", + "std", + "futures-core-03", + "futures-io-03", + "pin-project-lite", +] mp4 = [] pin-project = ["pin-project-lite"] -std = ["memchr/use_std", "bytes", "alloc"] -tokio = ["tokio-dep", "tokio-util/io", "futures-core-03", "pin-project-lite"] -tokio-02 = ["pin-project", "std", "tokio-02-dep", "futures-core-03", "pin-project-lite", "bytes_05"] -tokio-03 = ["pin-project", "std", "tokio-03-dep", "futures-core-03", "pin-project-lite"] +std = [ + "memchr/use_std", + "bytes", + "alloc", +] +tokio = [ + "tokio-dep", + "tokio-util/io", + "futures-core-03", + "pin-project-lite", +] +tokio-02 = [ + "pin-project", + "std", + "tokio-02-dep", + "futures-core-03", + "pin-project-lite", + "bytes_05", +] +tokio-03 = [ + "pin-project", + "std", + "tokio-03-dep", + "futures-core-03", + "pin-project-lite", +] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index ba58238..5d31969 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "combine" -version = "4.6.3" +version = "4.6.4" authors = ["Markus Westerlind <marwes91@gmail.com>"] description = "Fast parser combinators on arbitrary streams with zero-copy support." @@ -34,7 +34,7 @@ pin-project-lite = { version = "0.2", optional = true } tokio-02-dep = { version = "0.2.3", package = "tokio", features = ["io-util"], default-features = false, optional = true } tokio-03-dep = { version = "0.3", package = "tokio", default-features = false, optional = true } tokio-dep = { version = "1", package = "tokio", default-features = false, optional = true } -tokio-util = { version = "0.6", features = ["codec"], default-features = false, optional = true } +tokio-util = { version = "0.7", features = ["codec"], default-features = false, optional = true } futures-core-03 = { version = "0.3.1", package = "futures-core", default-features = false, optional = true } futures-io-03 = { version = "0.3.1", package = "futures-io", default-features = false, optional = true } bytes_05 = { version = "0.5", package = "bytes", optional = true } @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/combine/combine-4.6.3.crate" + value: "https://static.crates.io/crates/combine/combine-4.6.4.crate" } - version: "4.6.3" + version: "4.6.4" license_type: NOTICE last_upgrade_date { year: 2022 - month: 3 - day: 1 + month: 6 + day: 28 } } diff --git a/benches/http.rs b/benches/http.rs index 68414a5..e08e973 100644 --- a/benches/http.rs +++ b/benches/http.rs @@ -17,6 +17,7 @@ use { criterion::{black_box, Bencher, Criterion}, }; +#[allow(dead_code)] #[derive(Debug)] struct Request<'a> { method: &'a [u8], @@ -24,6 +25,7 @@ struct Request<'a> { version: &'a [u8], } +#[allow(dead_code)] #[derive(Debug)] struct Header<'a> { name: &'a [u8], diff --git a/src/stream/mod.rs b/src/stream/mod.rs index 803e9a8..ff9780e 100644 --- a/src/stream/mod.rs +++ b/src/stream/mod.rs @@ -53,7 +53,7 @@ pub mod buf_reader; /// Stream wrapper which provides a `ResetStream` impl for `StreamOnce` impls which do not have /// one. #[cfg(feature = "alloc")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))] pub mod buffered; #[cfg(feature = "std")] #[cfg_attr(docsrs, doc(cfg(feature = "std")))] |