From 10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 14:41:41 +0200 Subject: Merging upstream version 1.70.0+dfsg2. Signed-off-by: Daniel Baumann --- vendor/normalize-line-endings/.cargo-checksum.json | 1 + vendor/normalize-line-endings/Cargo.toml | 24 +++ vendor/normalize-line-endings/LICENSE | 201 +++++++++++++++++++++ vendor/normalize-line-endings/README.md | 8 + vendor/normalize-line-endings/src/lib.rs | 82 +++++++++ 5 files changed, 316 insertions(+) create mode 100644 vendor/normalize-line-endings/.cargo-checksum.json create mode 100644 vendor/normalize-line-endings/Cargo.toml create mode 100644 vendor/normalize-line-endings/LICENSE create mode 100644 vendor/normalize-line-endings/README.md create mode 100644 vendor/normalize-line-endings/src/lib.rs (limited to 'vendor/normalize-line-endings') diff --git a/vendor/normalize-line-endings/.cargo-checksum.json b/vendor/normalize-line-endings/.cargo-checksum.json new file mode 100644 index 000000000..3f3d961f4 --- /dev/null +++ b/vendor/normalize-line-endings/.cargo-checksum.json @@ -0,0 +1 @@ +{"files":{"Cargo.toml":"80c53a151710a0c13b62bb69189a984c4c7f354bd12d990fdce2a796c57ef63d","LICENSE":"b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1","README.md":"5e3f5e4f32f7267ff8d6bde917cb21b157930a71078048774d85ec7de9f2425e","src/lib.rs":"1ae29ba0393192db102a26bf8db05c15ed05adc7c4474ad1bde05ef2bc937225"},"package":"61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"} \ No newline at end of file diff --git a/vendor/normalize-line-endings/Cargo.toml b/vendor/normalize-line-endings/Cargo.toml new file mode 100644 index 000000000..eedc7dc00 --- /dev/null +++ b/vendor/normalize-line-endings/Cargo.toml @@ -0,0 +1,24 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# 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 +# +# 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) + +[package] +name = "normalize-line-endings" +version = "0.3.0" +authors = ["Richard Dodd "] +description = "Takes an iterator over chars and returns a new iterator with all line endings (\\r, \\n, or \\r\\n) as \\n" +documentation = "https://derekdreery.github.io/normalize-line-endings/normalize_line_endings/index.html" +readme = "./README.md" +keywords = ["chars", "line", "ending", "normalize"] +license = "Apache-2.0" +repository = "https://github.com/derekdreery/normalize-line-endings" + +[dependencies] diff --git a/vendor/normalize-line-endings/LICENSE b/vendor/normalize-line-endings/LICENSE new file mode 100644 index 000000000..8dada3eda --- /dev/null +++ b/vendor/normalize-line-endings/LICENSE @@ -0,0 +1,201 @@ + 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 + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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/normalize-line-endings/README.md b/vendor/normalize-line-endings/README.md new file mode 100644 index 000000000..438543ee1 --- /dev/null +++ b/vendor/normalize-line-endings/README.md @@ -0,0 +1,8 @@ +# Normalize-line-endings + +Consume an `Iterator` and return another with normalized line +endings. + +[documentation] + +[documentation]: https://docs.rs/normalize-line-endings diff --git a/vendor/normalize-line-endings/src/lib.rs b/vendor/normalize-line-endings/src/lib.rs new file mode 100644 index 000000000..955234a7e --- /dev/null +++ b/vendor/normalize-line-endings/src/lib.rs @@ -0,0 +1,82 @@ +#![warn(missing_docs)] +//! +//! Normalize line endings +//! +//! This crate provides a `normalize` method that takes a char iterator and returns +//! a new one with `\n` for all line endings + +/// This struct wraps a `std::io::Chars` to normalize line endings. +/// +/// Implements `Iterator` so can be used in place +struct Normalized { + iter: I, + prev_was_cr: bool, +} + +/// Take a Chars and return similar struct with normalized line endings +/// +/// # Example +/// ``` +/// use std::iter::FromIterator; +/// use normalize_line_endings::normalized; +/// +/// let input = "This is a string \n with \r some \n\r\n random newlines\r\r\n\n"; +/// assert_eq!( +/// &String::from_iter(normalized(input.chars())), +/// "This is a string \n with \n some \n\n random newlines\n\n\n" +/// ); +/// ``` +#[inline] +pub fn normalized(iter: impl Iterator) -> impl Iterator { + Normalized { + iter, + prev_was_cr: false, + } +} + +impl Iterator for Normalized +where + I: Iterator, +{ + type Item = char; + fn next(&mut self) -> Option { + match self.iter.next() { + Some('\n') if self.prev_was_cr => { + self.prev_was_cr = false; + match self.iter.next() { + Some('\r') => { + self.prev_was_cr = true; + Some('\n') + } + any => { + self.prev_was_cr = false; + any + } + } + } + Some('\r') => { + self.prev_was_cr = true; + Some('\n') + } + any => { + self.prev_was_cr = false; + any + } + } + } +} + +// tests +#[cfg(test)] +mod tests { + use std::iter::FromIterator; + + #[test] + fn normalized() { + let input = "This is a string \n with \r some \n\r\n random newlines\r\r\n\n"; + assert_eq!( + &String::from_iter(super::normalized(input.chars())), + "This is a string \n with \n some \n\n random newlines\n\n\n" + ); + } +} -- cgit v1.2.3