diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/gix-glob | |
parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-glob')
-rw-r--r-- | vendor/gix-glob/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/gix-glob/CHANGELOG.md | 33 | ||||
-rw-r--r-- | vendor/gix-glob/Cargo.toml | 6 | ||||
-rw-r--r-- | vendor/gix-glob/LICENSE-APACHE | 191 | ||||
-rw-r--r-- | vendor/gix-glob/LICENSE-MIT | 21 | ||||
-rw-r--r-- | vendor/gix-glob/src/pattern.rs | 5 | ||||
-rw-r--r-- | vendor/gix-glob/src/wildmatch.rs | 2 |
7 files changed, 251 insertions, 9 deletions
diff --git a/vendor/gix-glob/.cargo-checksum.json b/vendor/gix-glob/.cargo-checksum.json index 2b51774a3..269ea5bdd 100644 --- a/vendor/gix-glob/.cargo-checksum.json +++ b/vendor/gix-glob/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"73e3a4636335c2853e15bc63d8a2ff267565de058f216f27cebd4e5bea386cc8","Cargo.toml":"8017c1914bd426f057424c8dc7e4e08fe2fdaf85b0f54b56180d59b8eca3f541","src/lib.rs":"988fab13064310afa7982ad4c0011839cba1d176ef4acc72a5228e99bf341c2b","src/parse.rs":"7938377963357b1f0bc65b8dfcd9e9689c92278546a57b3f38a838518c1287fb","src/pattern.rs":"e173796e101830c28df2edd6726ea9e8976ce688e67aaef977576e7d724a687e","src/search/mod.rs":"d06236d151f7e8ac02a12ee749960302f61c5c943fb0c14c53d37e40d7bee434","src/search/pattern.rs":"515969fef015d321a39612a6e294b5216fac67c3820b1856cb9b3a01ad6cfa58","src/wildmatch.rs":"a42ea7dce3e24d591a582b6fe47e0fd2b6bfa6d4565591f168a9f59e06e2cc1c","tests/fixtures/generated-archives/make_baseline.tar.xz":"6bda59c1591dfd35f09cad5d09e2950b2a6ff885d9f7900535144a5275ab51c3","tests/fixtures/make_baseline.sh":"d6e93d2facf3bbd8e14b7bb579cea3be2e81f8fda8609ddde739d024fb019066","tests/glob.rs":"70c3b09855e0a495aa031586bc249a0b0270d72448f4d75277955019d7b11db0","tests/parse/mod.rs":"df604274c095b488b924a3e0ddfb3fb31bf1d59e04f608730c95981ddfd5e7b9","tests/pattern/matching.rs":"1a50ad5c36407d4f5ee79498355c272d3ba4910dad03733773dd9cd1e5d91278","tests/pattern/mod.rs":"28f9f3f99092be3813f93a4e0af149746305fa15326682adcbf3c61fa818534f","tests/search/mod.rs":"078b7bdaa0c022e1cdc88b69afa88a82033852137e69ce18995657d8e3fee6ca","tests/search/pattern.rs":"7368556d468196de6be78440986372256f42115b08fcee85de361faa24f2e341","tests/wildmatch/mod.rs":"8c285ced140edbe36b0f4fc6831d341bcd57f5e46c2083a7f0fb47e8e928c0a0"},"package":"c07c98204529ac3f24b34754540a852593d2a4c7349008df389240266627a72a"}
\ No newline at end of file +{"files":{"CHANGELOG.md":"3954f42ffa731a1e357531b9f187b4c5daeb3a480bff6657826ae486d2fac427","Cargo.toml":"975d0257e53082d26f471346f248fe1ebf48ac618608e27d847b1d8f9b0ce259","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","src/lib.rs":"988fab13064310afa7982ad4c0011839cba1d176ef4acc72a5228e99bf341c2b","src/parse.rs":"7938377963357b1f0bc65b8dfcd9e9689c92278546a57b3f38a838518c1287fb","src/pattern.rs":"a39fd609e9cd3d67079e434324819c56a8ad670c9fcf4ffb906b584674386ee8","src/search/mod.rs":"d06236d151f7e8ac02a12ee749960302f61c5c943fb0c14c53d37e40d7bee434","src/search/pattern.rs":"515969fef015d321a39612a6e294b5216fac67c3820b1856cb9b3a01ad6cfa58","src/wildmatch.rs":"f64da7dc4e7c1cd269dfa01f707909fd9af41176ebff498050b9311c41e6ccf1","tests/fixtures/generated-archives/make_baseline.tar.xz":"6bda59c1591dfd35f09cad5d09e2950b2a6ff885d9f7900535144a5275ab51c3","tests/fixtures/make_baseline.sh":"d6e93d2facf3bbd8e14b7bb579cea3be2e81f8fda8609ddde739d024fb019066","tests/glob.rs":"70c3b09855e0a495aa031586bc249a0b0270d72448f4d75277955019d7b11db0","tests/parse/mod.rs":"df604274c095b488b924a3e0ddfb3fb31bf1d59e04f608730c95981ddfd5e7b9","tests/pattern/matching.rs":"1a50ad5c36407d4f5ee79498355c272d3ba4910dad03733773dd9cd1e5d91278","tests/pattern/mod.rs":"28f9f3f99092be3813f93a4e0af149746305fa15326682adcbf3c61fa818534f","tests/search/mod.rs":"078b7bdaa0c022e1cdc88b69afa88a82033852137e69ce18995657d8e3fee6ca","tests/search/pattern.rs":"7368556d468196de6be78440986372256f42115b08fcee85de361faa24f2e341","tests/wildmatch/mod.rs":"8c285ced140edbe36b0f4fc6831d341bcd57f5e46c2083a7f0fb47e8e928c0a0"},"package":"cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"}
\ No newline at end of file diff --git a/vendor/gix-glob/CHANGELOG.md b/vendor/gix-glob/CHANGELOG.md index c79a77a11..c00f5d961 100644 --- a/vendor/gix-glob/CHANGELOG.md +++ b/vendor/gix-glob/CHANGELOG.md @@ -5,6 +5,36 @@ 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.8.0 (2023-06-06) + +A maintenance release without user-facing changes. + +### Commit Statistics + +<csr-read-only-do-not-edit/> + + - 8 commits contributed to the release over the course of 12 calendar days. + - 40 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 + +<csr-read-only-do-not-edit/> + +<details><summary>view details</summary> + + * **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)) + - 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)) + - 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)) +</details> + ## 0.7.0 (2023-04-27) A maintenance release without user-facing changes. @@ -13,7 +43,7 @@ A maintenance release without user-facing changes. <csr-read-only-do-not-edit/> - - 2 commits contributed to the release. + - 3 commits contributed to the release. - 0 commits were understood as [conventional](https://www.conventionalcommits.org). - 0 issues like '(#ID)' were seen in commit messages @@ -24,6 +54,7 @@ A maintenance release without user-facing changes. <details><summary>view details</summary> * **Uncategorized** + - Release gix-path v0.8.0, gix-glob v0.7.0, gix-attributes v0.12.0, gix-config-value v0.12.0, gix-ref v0.29.0, gix-sec v0.8.0, gix-config v0.22.0, gix-prompt v0.5.0, gix-url v0.18.0, gix-credentials v0.14.0, gix-discover v0.18.0, gix-ignore v0.2.0, gix-pack v0.35.0, gix-odb v0.45.0, gix-transport v0.31.0, gix-protocol v0.32.0, gix-refspec v0.10.1, gix-worktree v0.17.0, gix v0.44.1 ([`7ebc9f7`](https://github.com/Byron/gitoxide/commit/7ebc9f734ec4371dd27daa568c0244185bb49eb5)) - Prepare changelogs prior to release ([`0135158`](https://github.com/Byron/gitoxide/commit/013515897215400539bfd53c25548bd054186ba6)) - Bump gix-path v0.8.0, safety bump 20 crates (gix set to 0.44.1 manually) ([`43ebaf2`](https://github.com/Byron/gitoxide/commit/43ebaf267557218865862538ffc7bdf00558492f)) </details> diff --git a/vendor/gix-glob/Cargo.toml b/vendor/gix-glob/Cargo.toml index 672df2a26..25ae46635 100644 --- a/vendor/gix-glob/Cargo.toml +++ b/vendor/gix-glob/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.64" name = "gix-glob" -version = "0.7.0" +version = "0.8.0" authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"] description = "A WIP crate of the gitoxide project dealing with pattern matching" license = "MIT/Apache-2.0" @@ -43,10 +43,10 @@ version = "0.2.0" optional = true [dependencies.gix-features] -version = "^0.29.0" +version = "^0.30.0" [dependencies.gix-path] -version = "^0.8.0" +version = "^0.8.1" [dependencies.serde] version = "1.0.114" diff --git a/vendor/gix-glob/LICENSE-APACHE b/vendor/gix-glob/LICENSE-APACHE new file mode 100644 index 000000000..a51f59a06 --- /dev/null +++ b/vendor/gix-glob/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-glob/LICENSE-MIT b/vendor/gix-glob/LICENSE-MIT new file mode 100644 index 000000000..b58e818f1 --- /dev/null +++ b/vendor/gix-glob/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-glob/src/pattern.rs b/vendor/gix-glob/src/pattern.rs index 2aefaa9a0..3c0dbfea2 100644 --- a/vendor/gix-glob/src/pattern.rs +++ b/vendor/gix-glob/src/pattern.rs @@ -30,7 +30,7 @@ bitflags! { /// Describes whether to match a path case sensitively or not. /// -/// Used in [Pattern::matches_repo_relative_path()]. +/// Used in [`Pattern::matches_repo_relative_path()`]. #[derive(Default, Debug, PartialOrd, PartialEq, Copy, Clone, Hash, Ord, Eq)] pub enum Case { /// The case affects the match @@ -116,8 +116,7 @@ impl Pattern { value .len() .checked_sub(text.len()) - .map(|start| text.eq_ignore_ascii_case(&value[start..])) - .unwrap_or(false) + .map_or(false, |start| text.eq_ignore_ascii_case(&value[start..])) } else { value.ends_with(text.as_ref()) } diff --git a/vendor/gix-glob/src/wildmatch.rs b/vendor/gix-glob/src/wildmatch.rs index 5144a9b8b..bcf6c668d 100644 --- a/vendor/gix-glob/src/wildmatch.rs +++ b/vendor/gix-glob/src/wildmatch.rs @@ -343,7 +343,7 @@ pub(crate) mod function { } } } - t.next().map(|_| NoMatch).unwrap_or(Match) + t.next().map_or(Match, |_| NoMatch) } /// Employ pattern matching to see if `value` matches `pattern`. |