From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Sat, 4 Sep 2021 19:50:19 +0000 (+0200)
Subject: - cherrypicked from serv/rust-url@2efa106
X-Git-Tag: auto/th/cargo-0.26.0-3~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcargo.git;a=commitdiff_plain;h=e9e5c5804f8df68db457829fb95c312d49eb46bf

- cherrypicked from serv/rust-url@2efa106
---

diff --git a/cargo-url-buildfix.patch b/cargo-url-buildfix.patch
new file mode 100644
index 0000000..d113d5d
--- /dev/null
+++ b/cargo-url-buildfix.patch
@@ -0,0 +1,56 @@
+--- a/vendor/url/src/form_urlencoded.rs
++++ b/vendor/url/src/form_urlencoded.rs
+@@ -257,8 +257,16 @@ impl<'a> Target for &'a mut String {
+ // * `Serializer` keeps its target in a private field
+ // * Unlike in other `Target` impls, `UrlQuery::finished` does not return `Self`.
+ impl<'a> Target for ::UrlQuery<'a> {
+-    fn as_mut_string(&mut self) -> &mut String { &mut self.url.serialization }
+-    fn finish(self) -> &'a mut ::Url { self.url }
++    fn as_mut_string(&mut self) -> &mut String {
++        &mut self.url.as_mut().unwrap().serialization
++    }
++
++    fn finish(mut self) -> &'a mut ::Url {
++        let url = self.url.take().unwrap();
++        url.restore_already_parsed_fragment(self.fragment.take());
++        url
++    }
++
+     type Finished = &'a mut ::Url;
+ }
+ 
+--- a/vendor/url/src/lib.rs
++++ b/vendor/url/src/lib.rs
+@@ -1343,7 +1343,7 @@ impl Url {
+             self.serialization.push('?');
+         }
+ 
+-        let query = UrlQuery { url: self, fragment: fragment };
++        let query = UrlQuery { url: Some(self), fragment: fragment };
+         form_urlencoded::Serializer::for_suffix(query, query_start + "?".len())
+     }
+ 
+@@ -2423,13 +2423,15 @@ fn io_error<T>(reason: &str) -> io::Result<T> {
+ /// Implementation detail of `Url::query_pairs_mut`. Typically not used directly.
+ #[derive(Debug)]
+ pub struct UrlQuery<'a> {
+-    url: &'a mut Url,
++    url: Option<&'a mut Url>,
+     fragment: Option<String>,
+ }
+ 
+ impl<'a> Drop for UrlQuery<'a> {
+     fn drop(&mut self) {
+-        self.url.restore_already_parsed_fragment(self.fragment.take())
++        if let Some(url) = self.url.take() {
++            url.restore_already_parsed_fragment(self.fragment.take())
++        }
+     }
+ }
+ 
+--- a/vendor/url/.cargo-checksum.json~	2018-04-02 18:59:54.000000000 +0200
++++ b/vendor/url/.cargo-checksum.json	2021-09-04 08:58:40.666669065 +0200
+@@ -1 +1 @@
+-{"files":{".travis.yml":"f1183facdda0bd8d7ed7c4fed656b074f3c1dbfc53653dba99293edea0888e7a","Cargo.toml":"0c9e7c23f4216471a535938d0babb4c30595c0ed747ef208da3f042027a3b55b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","README.md":"eb3f4694003f408cbe3c7f3e9fbbc71241defb940cc55a816981f0f0f144c8eb","UPGRADING.md":"fbcc2d39bdf17db0745793db6626fcd5c909dddd4ce13b27566cfabece22c368","appveyor.yml":"c78486dbfbe6ebbf3d808afb9a19f7ec18c4704ce451c6305f0716999b70a1a6","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","docs/index.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","src/encoding.rs":"f3e109ca8ec5a9130da50cdfb3003530aedb6dd5a440f0790d76b71f6981119c","src/form_urlencoded.rs":"320418526c4564a4469581d426e7467bcefe504eecd098e1eb90a2663a75fd80","src/host.rs":"66a2c0c77a8add2da16bc690fbc82b130cf1367ac655fc36990a214e193a4d6c","src/lib.rs":"899d5741dc0da32cea327f11e10bd2f83722c854f946b7201aae4f6c12edc477","src/origin.rs":"6e4821eb9600a32ef54d05c8e1a7937f6d9b4dd1e3bda7f36c7988f6a2bef78b","src/parser.rs":"91882bcf1dc87c98b2849fe2cecfcbcfa9e478dd39e07b7c029269c98e613163","src/path_segments.rs":"7bd3142eaa568863ef44e2255c181239141f9eeee337f889b9ffaaeab4ca669d","src/quirks.rs":"6cf1697bad363532cbcc60917a9b126560ac3ab3e1a77da0abcf4f2a40c8233a","src/slicing.rs":"4e539886b23945a92094625f3e531a4bff40daa44240b5d19ee8577478c4f7fe","tests/data.rs":"e95a78cadbe156597938057b7048d0d0ac4d3568ca548c0658fbea88d71f2de1","tests/setters_tests.json":"08ddaa632ad19c81e83b904bfaa94bc971f26e2bdfcef27d2f93fd033ad57340","tests/unit.rs":"fb17881a57aab4d369cdbcbb4d062083fc2b80319187fe0040891d2830de22fe","tests/urltestdata.json":"1b0c7c727d8d7e79dfb0d0aa347ff05675ddb68bc4ead38f83fd8e89bc59cc32"},"package":"f808aadd8cfec6ef90e4a14eb46f24511824d1ac596b9682703c87056c8678b7"}
+\ No newline at end of file
++{"files":{".travis.yml":"f1183facdda0bd8d7ed7c4fed656b074f3c1dbfc53653dba99293edea0888e7a","Cargo.toml":"0c9e7c23f4216471a535938d0babb4c30595c0ed747ef208da3f042027a3b55b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","README.md":"eb3f4694003f408cbe3c7f3e9fbbc71241defb940cc55a816981f0f0f144c8eb","UPGRADING.md":"fbcc2d39bdf17db0745793db6626fcd5c909dddd4ce13b27566cfabece22c368","appveyor.yml":"c78486dbfbe6ebbf3d808afb9a19f7ec18c4704ce451c6305f0716999b70a1a6","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","docs/index.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","src/encoding.rs":"f3e109ca8ec5a9130da50cdfb3003530aedb6dd5a440f0790d76b71f6981119c","src/form_urlencoded.rs":"d8c35e92375cafcd7e12c4f0d5374bab62aa1f333629d55b007a9c3d5c3cb615","src/host.rs":"66a2c0c77a8add2da16bc690fbc82b130cf1367ac655fc36990a214e193a4d6c","src/lib.rs":"d97c70b4b8384bfda5c53d80b42e8d5e902840541d79f807d391214beca497e8","src/origin.rs":"6e4821eb9600a32ef54d05c8e1a7937f6d9b4dd1e3bda7f36c7988f6a2bef78b","src/parser.rs":"91882bcf1dc87c98b2849fe2cecfcbcfa9e478dd39e07b7c029269c98e613163","src/path_segments.rs":"7bd3142eaa568863ef44e2255c181239141f9eeee337f889b9ffaaeab4ca669d","src/quirks.rs":"6cf1697bad363532cbcc60917a9b126560ac3ab3e1a77da0abcf4f2a40c8233a","src/slicing.rs":"4e539886b23945a92094625f3e531a4bff40daa44240b5d19ee8577478c4f7fe","tests/data.rs":"e95a78cadbe156597938057b7048d0d0ac4d3568ca548c0658fbea88d71f2de1","tests/setters_tests.json":"08ddaa632ad19c81e83b904bfaa94bc971f26e2bdfcef27d2f93fd033ad57340","tests/unit.rs":"fb17881a57aab4d369cdbcbb4d062083fc2b80319187fe0040891d2830de22fe","tests/urltestdata.json":"1b0c7c727d8d7e79dfb0d0aa347ff05675ddb68bc4ead38f83fd8e89bc59cc32"},"package":"f808aadd8cfec6ef90e4a14eb46f24511824d1ac596b9682703c87056c8678b7"}