Snap for 10453563 from 563b03588232e04fb7d335b6d8c649b01a57e717 to mainline-os-statsd-release
Change-Id: I9837266f1e8309067918aa854559533923f4a4a3
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
diff --git a/Android.bp b/Android.bp
index ca5cb84..473d00e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,16 +45,17 @@
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: [
"//apex_available:platform",
"com.android.resolv",
],
+ product_available: true,
+ vendor_available: true,
min_sdk_version: "29",
}
diff --git a/Cargo.toml b/Cargo.toml
index 4c9fae2..037361d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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" }
diff --git a/METADATA b/METADATA
index cffa7b4..e66dbb1 100644
--- a/METADATA
+++ b/METADATA
@@ -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 @@
}
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
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 407ec5c..b2d8ebc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,16 +6,9 @@
},
{
"path": "external/rust/crates/url"
- }
- ],
- "presubmit": [
+ },
{
- "name": "doh_unit_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "doh_unit_test"
+ "path": "packages/modules/DnsResolver"
}
]
}
diff --git a/src/lib.rs b/src/lib.rs
index 765ee16..477594b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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 @@
// 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,
