From dc0db358abe19481e475e10c32149b53370f1a1c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:31 +0200 Subject: Merging upstream version 1.72.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-packetline/.cargo-checksum.json | 2 +- vendor/gix-packetline/CHANGELOG.md | 63 ++++++- vendor/gix-packetline/Cargo.toml | 5 +- vendor/gix-packetline/LICENSE-APACHE | 191 +++++++++++++++++++++ vendor/gix-packetline/LICENSE-MIT | 21 +++ vendor/gix-packetline/src/read/async_io.rs | 9 +- vendor/gix-packetline/src/read/blocking_io.rs | 9 +- vendor/gix-packetline/src/read/mod.rs | 2 +- .../gix-packetline/src/read/sidebands/async_io.rs | 8 +- .../src/read/sidebands/blocking_io.rs | 6 +- 10 files changed, 292 insertions(+), 24 deletions(-) create mode 100644 vendor/gix-packetline/LICENSE-APACHE create mode 100644 vendor/gix-packetline/LICENSE-MIT (limited to 'vendor/gix-packetline') diff --git a/vendor/gix-packetline/.cargo-checksum.json b/vendor/gix-packetline/.cargo-checksum.json index f965f7132..6a766a3c0 100644 --- a/vendor/gix-packetline/.cargo-checksum.json +++ b/vendor/gix-packetline/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"35d089b24cc41e09638aad24f1fdf8c4a896d97534e0ca17ce5ca26e1984011e","Cargo.toml":"34d3ce4bd80a5bbb4dc46b59aece8aa36f564a7802cb452fd791fab47a20c198","src/decode.rs":"b6a8bc0c9723dce3385e2d084698f5103dff32945acc73cd9e34103403231ab6","src/encode/async_io.rs":"a1d6f14a07c386c357359c8654597994e9206ad9fca24e09f4200767ecadcd81","src/encode/blocking_io.rs":"58526393c361fccb786b94d4170264199e0d9b4a93c6878de406d9747bf05f81","src/encode/mod.rs":"bb0b79021c10803c1ab1b6b4c98f0720972c24cc741223387960472199e46b20","src/lib.rs":"53f89f86469f105b6701200e15ce9c1dddc9d0c0a41b3b9a0d4fa956f996566a","src/line/async_io.rs":"875ae42f351faf46b5df2db46fb1a291dc1d558ce79945f0bea5d47aecf6bef5","src/line/blocking_io.rs":"c89811d17365f57759d496d8d2d1a1c2c368c39182cda51e64a2d2a9b37d8aca","src/line/mod.rs":"0eb03c4086ef6508fe56a5f94dfda121c412344392d51c317069af2c5899944f","src/read/async_io.rs":"1db67cbd80a59896ff33ce0605f52eaf7da53088a83733a41f8bbe0502153b76","src/read/blocking_io.rs":"8f0f1a0d3eedb088881925215910758e42069bda90a12b613f77fab106321046","src/read/mod.rs":"2aa2dc003e8ceb11f9a3a45872505774f5c1c76936f3123b3856b288f011aa91","src/read/sidebands/async_io.rs":"bd2c9bd782b02b635d12e377dc5f908bd872f0435f4a5567cdbc99ae8c273f05","src/read/sidebands/blocking_io.rs":"a6d2e2f27bd6e7d307ba3f29d82138f09b023925c313c7d01c0657d6a87d95d8","src/read/sidebands/mod.rs":"8861e041d7da5d96fc0d4ae52f30d6ede64501b2de95cf866e85d26ce4255bc3","src/write/async_io.rs":"23a523c0fec725dded47d09a866c5f2d4fe837cc3466bf4e31b411b1f4e36af2","src/write/blocking_io.rs":"485baff59b71611b9f8e1b448ea954cafe8e3b57511aa2e50cf458685c3b42ed","src/write/mod.rs":"348a7a8b7aed93bbfaab61db91b54a0a7e57d2b7bb4622bdaa8eecda715189cb"},"package":"51f53abaf1171d2fe99f80ac8ed6645904a1bfd706674749ac112bdd2d4f0777"} \ No newline at end of file +{"files":{"CHANGELOG.md":"1f93003f3569bfcade19224fdef4ba7bcceb9977f5962f6356e19d9ad94e5128","Cargo.toml":"c4c9aaa4616e99c4755ac0e0fa62793a2d999b3413a6bf5ea268538c7be7d0ae","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","src/decode.rs":"b6a8bc0c9723dce3385e2d084698f5103dff32945acc73cd9e34103403231ab6","src/encode/async_io.rs":"a1d6f14a07c386c357359c8654597994e9206ad9fca24e09f4200767ecadcd81","src/encode/blocking_io.rs":"58526393c361fccb786b94d4170264199e0d9b4a93c6878de406d9747bf05f81","src/encode/mod.rs":"bb0b79021c10803c1ab1b6b4c98f0720972c24cc741223387960472199e46b20","src/lib.rs":"53f89f86469f105b6701200e15ce9c1dddc9d0c0a41b3b9a0d4fa956f996566a","src/line/async_io.rs":"875ae42f351faf46b5df2db46fb1a291dc1d558ce79945f0bea5d47aecf6bef5","src/line/blocking_io.rs":"c89811d17365f57759d496d8d2d1a1c2c368c39182cda51e64a2d2a9b37d8aca","src/line/mod.rs":"0eb03c4086ef6508fe56a5f94dfda121c412344392d51c317069af2c5899944f","src/read/async_io.rs":"fe3124c2b55cd8dfef610b8e2e2bd069ff7f35ba547d2f7450a350d4a1b8692c","src/read/blocking_io.rs":"d18d67bf2d03f47c5d9212a4f9475021b6694a886a4be4101f0379bf2aa5351b","src/read/mod.rs":"61abd34a7127099cbf3f790b8700939b070a0a3212c9e18cfd28dd9fe918f949","src/read/sidebands/async_io.rs":"232cb87708264b52b48716ae398016a864fafc9e49a66cd17e0c6bf54ed9ecd5","src/read/sidebands/blocking_io.rs":"701f6785ba3063d97319ebfe3c7bf3edd977540872cffe5a5d6143178364fefd","src/read/sidebands/mod.rs":"8861e041d7da5d96fc0d4ae52f30d6ede64501b2de95cf866e85d26ce4255bc3","src/write/async_io.rs":"23a523c0fec725dded47d09a866c5f2d4fe837cc3466bf4e31b411b1f4e36af2","src/write/blocking_io.rs":"485baff59b71611b9f8e1b448ea954cafe8e3b57511aa2e50cf458685c3b42ed","src/write/mod.rs":"348a7a8b7aed93bbfaab61db91b54a0a7e57d2b7bb4622bdaa8eecda715189cb"},"package":"74414f89a6b72fa1a530ce8e646faf1a05499c3f4a5c15441d17ae8c978578eb"} \ No newline at end of file diff --git a/vendor/gix-packetline/CHANGELOG.md b/vendor/gix-packetline/CHANGELOG.md index 2c42d9d83..ae647cd1f 100644 --- a/vendor/gix-packetline/CHANGELOG.md +++ b/vendor/gix-packetline/CHANGELOG.md @@ -5,6 +5,66 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.16.2 (2023-06-06) + +A maintenance release without user-facing changes. + +### Commit Statistics + + + + - 6 commits contributed to the release over the course of 12 calendar days. + - 12 days passed between releases. + - 0 commits were understood as [conventional](https://www.conventionalcommits.org). + - 0 issues like '(#ID)' were seen in commit messages + +### Commit Details + + + +
view details + + * **Uncategorized** + - Prepare changelogs prior to release ([`8f15cec`](https://github.com/Byron/gitoxide/commit/8f15cec1ec7d5a9d56bb158f155011ef2bb3539b)) + - Merge branch 'fix-docs' ([`420553a`](https://github.com/Byron/gitoxide/commit/420553a10d780e0b2dc466cac120989298a5f187)) + - Cleaning up documentation ([`2578e57`](https://github.com/Byron/gitoxide/commit/2578e576bfa365d194a23a1fb0bf09be230873de)) + - Apply -W clippy::cloned-instead-of-copied ([`150463c`](https://github.com/Byron/gitoxide/commit/150463c26f0d2e1c2b5facba731ccba29cf23228)) + - Merge branch 'auto-clippy' ([`dbf8aa1`](https://github.com/Byron/gitoxide/commit/dbf8aa19d19109195d0274928eae4b94f248cd88)) + - Autofix map-or-unwrap clippy lint (and manual fix what was left) ([`2087032`](https://github.com/Byron/gitoxide/commit/2087032b5956dcd82bce6ac57e530e8724b57f17)) +
+ +## 0.16.1 (2023-05-25) + +### Bug Fixes + + - docs.rs to build docs again + Fixes https://github.com/Byron/gitoxide/issues/868 by using a valid feature declaration + for use on docs.rs. + +### Commit Statistics + + + + - 5 commits contributed to the release. + - 28 days passed between releases. + - 1 commit was understood as [conventional](https://www.conventionalcommits.org). + - 1 unique issue was worked on: [#868](https://github.com/Byron/gitoxide/issues/868) + +### Commit Details + + + +
view details + + * **[#868](https://github.com/Byron/gitoxide/issues/868)** + - Docs.rs to build docs again ([`77f380e`](https://github.com/Byron/gitoxide/commit/77f380e495867e170128218516cf3c9d6661472e)) + * **Uncategorized** + - Release gix-packetline v0.16.1 ([`d70ce9f`](https://github.com/Byron/gitoxide/commit/d70ce9f822541fdaebb2eb1815929676e6af8648)) + - Merge branch 'main' into auto-clippy ([`3ef5c90`](https://github.com/Byron/gitoxide/commit/3ef5c90aebce23385815f1df674c1d28d58b4b0d)) + - Merge branch 'blinxen/main' ([`9375cd7`](https://github.com/Byron/gitoxide/commit/9375cd75b01aa22a0e2eed6305fe45fabfd6c1ac)) + - Include license files in all crates ([`facaaf6`](https://github.com/Byron/gitoxide/commit/facaaf633f01c857dcf2572c6dbe0a92b7105c1c)) +
+ ## 0.16.0 (2023-04-26) ### New Features (BREAKING) @@ -21,7 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - - 6 commits contributed to the release over the course of 9 calendar days. + - 7 commits contributed to the release over the course of 9 calendar days. - 27 days passed between releases. - 1 commit was understood as [conventional](https://www.conventionalcommits.org). - 1 unique issue was worked on: [#814](https://github.com/Byron/gitoxide/issues/814) @@ -35,6 +95,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * **[#814](https://github.com/Byron/gitoxide/issues/814)** - Rename `serde1` cargo feature to `serde` and use the weak-deps cargo capability. ([`b83ee36`](https://github.com/Byron/gitoxide/commit/b83ee366a3c65c717beb587ad809268f1c54b8ad)) * **Uncategorized** + - Release gix-index v0.16.0, gix-mailmap v0.12.0, gix-pack v0.34.0, gix-odb v0.44.0, gix-packetline v0.16.0, gix-transport v0.30.0, gix-protocol v0.31.0, gix-revision v0.13.0, gix-refspec v0.10.0, gix-worktree v0.16.0, gix v0.44.0 ([`d7173b2`](https://github.com/Byron/gitoxide/commit/d7173b2d2cb79685fdf7f618c31c576db24fa648)) - Release gix-index v0.16.0, gix-mailmap v0.12.0, gix-pack v0.34.0, gix-odb v0.44.0, gix-packetline v0.16.0, gix-transport v0.30.0, gix-protocol v0.31.0, gix-revision v0.13.0, gix-refspec v0.10.0, gix-worktree v0.16.0, gix v0.44.0 ([`e4df557`](https://github.com/Byron/gitoxide/commit/e4df5574c0813a0236319fa6e8b3b41bab179fc8)) - Release gix-hash v0.11.1, gix-path v0.7.4, gix-glob v0.6.0, gix-attributes v0.11.0, gix-config-value v0.11.0, gix-fs v0.1.1, gix-tempfile v5.0.3, gix-utils v0.1.1, gix-lock v5.0.1, gix-object v0.29.1, gix-ref v0.28.0, gix-sec v0.7.0, gix-config v0.21.0, gix-prompt v0.4.0, gix-url v0.17.0, gix-credentials v0.13.0, gix-diff v0.29.0, gix-discover v0.17.0, gix-hashtable v0.2.0, gix-ignore v0.1.0, gix-bitmap v0.2.3, gix-traverse v0.25.0, gix-index v0.16.0, gix-mailmap v0.12.0, gix-pack v0.34.0, gix-odb v0.44.0, gix-packetline v0.16.0, gix-transport v0.30.0, gix-protocol v0.31.0, gix-revision v0.13.0, gix-refspec v0.10.0, gix-worktree v0.16.0, gix v0.44.0, safety bump 7 crates ([`91134a1`](https://github.com/Byron/gitoxide/commit/91134a11c8ba0e942f692488ec9bce9fa1086324)) - Prepare changelogs prior to release ([`30a1a71`](https://github.com/Byron/gitoxide/commit/30a1a71f36f24faac0e0b362ffdfedea7f9cdbf1)) diff --git a/vendor/gix-packetline/Cargo.toml b/vendor/gix-packetline/Cargo.toml index ca1af1e08..8b63b87f9 100644 --- a/vendor/gix-packetline/Cargo.toml +++ b/vendor/gix-packetline/Cargo.toml @@ -13,10 +13,11 @@ edition = "2021" rust-version = "1.64" name = "gix-packetline" -version = "0.16.0" +version = "0.16.2" authors = ["Sebastian Thiel "] include = [ "src/**/*", + "LICENSE-*", "CHANGELOG.md", ] description = "A WIP crate of the gitoxide project implementing the pkt-line serialization format" @@ -27,7 +28,7 @@ repository = "https://github.com/Byron/gitoxide" features = [ "document-features", "blocking-io", - "dep:serde", + "serde", ] rustdoc-args = [ "--cfg", diff --git a/vendor/gix-packetline/LICENSE-APACHE b/vendor/gix-packetline/LICENSE-APACHE new file mode 100644 index 000000000..a51f59a06 --- /dev/null +++ b/vendor/gix-packetline/LICENSE-APACHE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2018-2021 Sebastian Thiel, and [contributors](https://github.com/byron/gitoxide/contributors) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/gix-packetline/LICENSE-MIT b/vendor/gix-packetline/LICENSE-MIT new file mode 100644 index 000000000..b58e818f1 --- /dev/null +++ b/vendor/gix-packetline/LICENSE-MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018-2021 Sebastian Thiel, and [contributors](https://github.com/byron/gitoxide/contributors). + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/gix-packetline/src/read/async_io.rs b/vendor/gix-packetline/src/read/async_io.rs index bb4dcf2c1..402c2434b 100644 --- a/vendor/gix-packetline/src/read/async_io.rs +++ b/vendor/gix-packetline/src/read/async_io.rs @@ -37,7 +37,7 @@ where } /// This function is needed to help the borrow checker allow us to return references all the time - /// It contains a bunch of logic shared between peek and read_line invocations. + /// It contains a bunch of logic shared between peek and `read_line` invocations. async fn read_line_inner_exhaustive<'a>( reader: &mut T, buf: &'a mut Vec, @@ -51,7 +51,7 @@ where Some(match Self::read_line_inner(reader, buf).await { Ok(Ok(line)) => { if delimiters.contains(&line) { - let stopped_at = delimiters.iter().find(|l| **l == line).cloned(); + let stopped_at = delimiters.iter().find(|l| **l == line).copied(); buf.clear(); return (true, stopped_at, None); } else if fail_on_err_lines { @@ -68,10 +68,7 @@ where ); } } - let len = line - .as_slice() - .map(|s| s.len() + U16_HEX_BYTES) - .unwrap_or(U16_HEX_BYTES); + let len = line.as_slice().map_or(U16_HEX_BYTES, |s| s.len() + U16_HEX_BYTES); if buf_resize { buf.resize(len, 0); } diff --git a/vendor/gix-packetline/src/read/blocking_io.rs b/vendor/gix-packetline/src/read/blocking_io.rs index 6af660b7f..50c634c4c 100644 --- a/vendor/gix-packetline/src/read/blocking_io.rs +++ b/vendor/gix-packetline/src/read/blocking_io.rs @@ -31,7 +31,7 @@ where } /// This function is needed to help the borrow checker allow us to return references all the time - /// It contains a bunch of logic shared between peek and read_line invocations. + /// It contains a bunch of logic shared between peek and `read_line` invocations. fn read_line_inner_exhaustive<'a>( reader: &mut T, buf: &'a mut Vec, @@ -45,7 +45,7 @@ where Some(match Self::read_line_inner(reader, buf) { Ok(Ok(line)) => { if delimiters.contains(&line) { - let stopped_at = delimiters.iter().find(|l| **l == line).cloned(); + let stopped_at = delimiters.iter().find(|l| **l == line).copied(); buf.clear(); return (true, stopped_at, None); } else if fail_on_err_lines { @@ -62,10 +62,7 @@ where ); } } - let len = line - .as_slice() - .map(|s| s.len() + U16_HEX_BYTES) - .unwrap_or(U16_HEX_BYTES); + let len = line.as_slice().map_or(U16_HEX_BYTES, |s| s.len() + U16_HEX_BYTES); if buf_resize { buf.resize(len, 0); } diff --git a/vendor/gix-packetline/src/read/mod.rs b/vendor/gix-packetline/src/read/mod.rs index e06b90d13..0fd30c892 100644 --- a/vendor/gix-packetline/src/read/mod.rs +++ b/vendor/gix-packetline/src/read/mod.rs @@ -95,7 +95,7 @@ impl StreamingPeekableIter { /// If `value` is `true` the provider will check for special `ERR` packet lines and stop iteration when one is encountered. /// - /// Use [`stopped_at()]`[StreamingPeekableIter::stopped_at()] to inspect the cause of the end of the iteration. + /// Use [`stopped_at()]`[`StreamingPeekableIter::stopped_at()`] to inspect the cause of the end of the iteration. /// ne pub fn fail_on_err_lines(&mut self, value: bool) { self.fail_on_err_lines = value; diff --git a/vendor/gix-packetline/src/read/sidebands/async_io.rs b/vendor/gix-packetline/src/read/sidebands/async_io.rs index 96973a36f..37f93bca9 100644 --- a/vendor/gix-packetline/src/read/sidebands/async_io.rs +++ b/vendor/gix-packetline/src/read/sidebands/async_io.rs @@ -77,7 +77,7 @@ mod tests { use super::*; fn receiver(_i: T) {} - /// We want to declare items containing pointers of StreamingPeekableIter `Send` as well, so it must be `Send` itself. + /// We want to declare items containing pointers of `StreamingPeekableIter` `Send` as well, so it must be `Send` itself. #[test] fn streaming_peekable_iter_is_send() { receiver(StreamingPeekableIter::new(Vec::::new(), &[])); @@ -118,7 +118,7 @@ where } } - /// Forwards to the parent [StreamingPeekableIter::reset_with()] + /// Forwards to the parent [`StreamingPeekableIter::reset_with()`] pub fn reset_with(&mut self, delimiters: &'static [PacketLineRef<'static>]) { if let State::Idle { ref mut parent } = self.state { parent @@ -128,7 +128,7 @@ where } } - /// Forwards to the parent [StreamingPeekableIter::stopped_at()] + /// Forwards to the parent [`StreamingPeekableIter::stopped_at()`] pub fn stopped_at(&self) -> Option> { match self.state { State::Idle { ref parent } => { @@ -146,7 +146,7 @@ where self.handle_progress = handle_progress; } - /// Effectively forwards to the parent [StreamingPeekableIter::peek_line()], allowing to see what would be returned + /// Effectively forwards to the parent [`StreamingPeekableIter::peek_line()`], allowing to see what would be returned /// next on a call to [`read_line()`][io::BufRead::read_line()]. /// /// # Warning diff --git a/vendor/gix-packetline/src/read/sidebands/blocking_io.rs b/vendor/gix-packetline/src/read/sidebands/blocking_io.rs index 20c4a2bce..f5c87aeb8 100644 --- a/vendor/gix-packetline/src/read/sidebands/blocking_io.rs +++ b/vendor/gix-packetline/src/read/sidebands/blocking_io.rs @@ -67,12 +67,12 @@ where } } - /// Forwards to the parent [StreamingPeekableIter::reset_with()] + /// Forwards to the parent [`StreamingPeekableIter::reset_with()`] pub fn reset_with(&mut self, delimiters: &'static [PacketLineRef<'static>]) { self.parent.reset_with(delimiters) } - /// Forwards to the parent [StreamingPeekableIter::stopped_at()] + /// Forwards to the parent [`StreamingPeekableIter::stopped_at()`] pub fn stopped_at(&self) -> Option> { self.parent.stopped_at } @@ -82,7 +82,7 @@ where self.handle_progress = handle_progress; } - /// Effectively forwards to the parent [StreamingPeekableIter::peek_line()], allowing to see what would be returned + /// Effectively forwards to the parent [`StreamingPeekableIter::peek_line()`], allowing to see what would be returned /// next on a call to [`read_line()`][io::BufRead::read_line()]. /// /// # Warning -- cgit v1.2.3