diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-12-12 08:28:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-12 08:28:30 +0000 |
commit | 0512ac4f7cf0d14e327e07c797784a36e3e95121 (patch) | |
tree | 432a25f710bbe3936691a0f197fb9fa876acabe8 | |
parent | 6f4d2f36c037a2b55f51930343c0673653c76a54 (diff) | |
parent | 954f11b585794dde3aa071342d47fefdbbec07a5 (diff) | |
download | form_urlencoded-0512ac4f7cf0d14e327e07c797784a36e3e95121.tar.gz |
Merge "Upgrade form_urlencoded to 1.1.0" am: a27dc36023 am: 954f11b585
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/2337805
Change-Id: If8fd0d72b553c48ed8161fb6e1bda44fde082a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 7 | ||||
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | Cargo.toml | 18 | ||||
-rw-r--r-- | Cargo.toml.orig | 8 | ||||
-rw-r--r-- | METADATA | 14 | ||||
-rw-r--r-- | src/lib.rs | 6 |
6 files changed, 27 insertions, 29 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index cc75365..aec1933 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,6 @@ { "git": { - "sha1": "ea7a69e9d69248ca6f69a6294abed225754f92fe" - } -} + "sha1": "359bc90a4f07224f79cc79c45dc873d44bcd6f14" + }, + "path_in_vcs": "form_urlencoded" +}
\ No newline at end of file @@ -45,11 +45,10 @@ rust_library { host_supported: true, crate_name: "form_urlencoded", cargo_env_compat: true, - cargo_pkg_version: "1.0.1", + cargo_pkg_version: "1.1.0", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ - "libmatches", "libpercent_encoding", ], apex_available: [ @@ -3,26 +3,24 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] edition = "2018" +rust-version = "1.51" name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" authors = ["The rust-url developers"] description = "Parser and serializer for the application/x-www-form-urlencoded syntax, as used by HTML forms." -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/servo/rust-url" [lib] test = false -[dependencies.matches] -version = "0.1" [dependencies.percent-encoding] -version = "2.1.0" +version = "2.2.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 0c603bd..bdbb5ce 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,15 +1,15 @@ [package] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" authors = ["The rust-url developers"] description = "Parser and serializer for the application/x-www-form-urlencoded syntax, as used by HTML forms." repository = "https://github.com/servo/rust-url" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" +rust-version = "1.51" [lib] test = false [dependencies] -matches = "0.1" -percent-encoding = { version = "2.1.0", path = "../percent_encoding" } +percent-encoding = { version = "2.2.0", path = "../percent_encoding" } @@ -1,3 +1,7 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update rust/crates/form_urlencoded +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "form_urlencoded" description: "Parser and serializer for the application/x-www-form-urlencoded syntax, as used by HTML forms." third_party { @@ -7,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate" + value: "https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.1.0.crate" } - version: "1.0.1" + version: "1.1.0" license_type: NOTICE last_upgrade_date { - year: 2021 - month: 2 - day: 19 + year: 2022 + month: 12 + day: 9 } } @@ -13,9 +13,6 @@ //! Converts between a string (such as an URL’s query string) //! and a sequence of (name, value) pairs. -#[macro_use] -extern crate matches; - use percent_encoding::{percent_decode, percent_encode_byte}; use std::borrow::{Borrow, Cow}; use std::str; @@ -402,8 +399,7 @@ pub(crate) fn decode_utf8_lossy(input: Cow<'_, [u8]>) -> Cow<'_, str> { // replace invalid bytes with a placeholder. // First we do a debug_assert to confirm our description above. - let raw_utf8: *const [u8]; - raw_utf8 = utf8.as_bytes(); + let raw_utf8: *const [u8] = utf8.as_bytes(); debug_assert!(raw_utf8 == &*bytes as *const [u8]); // Given we know the original input bytes are valid UTF-8, |