diff --git a/Cargo.toml b/Cargo.toml index 4419d40..5456c5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Arne Beer "] homepage = "https://github.com/nukesor/comfy-table" repository = "https://github.com/nukesor/comfy-table" documentation = "https://docs.rs/comfy-table/" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["terminal", "table", "unicode"] readme = "README.md" rust-version = "1.64" @@ -53,11 +53,11 @@ debug = [] integration_test = [] [dependencies] +ansi-str = { version = "0.8", optional = true } +console = { version = "0.15", optional = true } strum = "0.26" strum_macros = "0.26" unicode-width = "0.2" -ansi-str = { version = "0.8", optional = true } -console = { version = "0.15", optional = true } [dev-dependencies] criterion = "0.5" @@ -69,6 +69,8 @@ rstest = "0.23" # We don't need any of the default features for crossterm. # However, the windows build needs the windows feature enabled. [target.'cfg(not(windows))'.dependencies] -crossterm = { version = "0.28", optional=true, default-features = false } +crossterm = { version = "0.28", optional = true, default-features = false } [target.'cfg(windows)'.dependencies] -crossterm = { version = "0.28", optional=true, default-features = false, features=["windows"] } +crossterm = { version = "0.28", optional = true, default-features = false, features = [ + "windows", +] } diff --git a/LICENSE.APACHE b/LICENSE.APACHE new file mode 100644 index 0000000..f433b1a --- /dev/null +++ b/LICENSE.APACHE @@ -0,0 +1,177 @@ + + 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 diff --git a/LICENSE b/LICENSE.MIT similarity index 100% rename from LICENSE rename to LICENSE.MIT diff --git a/tests/all/property_test.proptest-regressions b/tests/all/property_test.proptest-regressions index a85a805..74eea80 100644 --- a/tests/all/property_test.proptest-regressions +++ b/tests/all/property_test.proptest-regressions @@ -14,3 +14,4 @@ cc 0d4d3573fbe99ac650d858c7a306f8c2ed7cf5fb5998f2c30495bb37849c2c5b # shrinks to cc 5e2562ec5b8d70abf05ea49ba65a178f086f1f3ed9251506f7b3e6bbb9091015 # shrinks to mut table = Table { columns: [Column { index: 0, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: None }, Column { index: 1, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: None }, Column { index: 2, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: Some(UpperBoundary(Percentage(0))) }], style: {BottomBorderIntersections: '+', MiddleIntersections: '+', HorizontalLines: '-', RightHeaderIntersection: '+', VerticalLines: '|', TopLeftCorner: '+', BottomLeftCorner: '+', LeftBorder: '|', HeaderLines: '=', RightBorderIntersections: '|', TopBorder: '-', MiddleHeaderIntersections: '=', TopRightCorner: '+', RightBorder: '|', LeftBorderIntersections: '|', BottomRightCorner: '+', BottomBorder: '-', TopBorderIntersections: '+', LeftHeaderIntersection: '+'}, header: None, rows: [Row { index: Some(0), cells: [], max_height: None }, Row { index: Some(1), cells: [], max_height: None }, Row { index: Some(2), cells: [], max_height: None }, Row { index: Some(3), cells: [], max_height: None }, Row { index: Some(4), cells: [], max_height: None }, Row { index: Some(5), cells: [], max_height: None }, Row { index: Some(6), cells: [], max_height: None }, Row { index: Some(7), cells: [Cell { content: [""], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }, Cell { content: [""], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }, Cell { content: [""], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }], max_height: None }], arrangement: Dynamic, delimiter: None, no_tty: false, use_stderr: false, width: None, enforce_styling: false, style_text_only: false }, table_width = 351 cc ac6d94f68bcd585b1ffff6b3b3e10b625d79ad96ec317ad147601c68bee5aa99 # shrinks to mut table = Table { columns: [Column { index: 0, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: Some(UpperBoundary(Percentage(127))) }, Column { index: 1, padding: (1, 1), delimiter: None, cell_alignment: Some(Left), constraint: Some(LowerBoundary(Percentage(23))) }, Column { index: 2, padding: (1, 1), delimiter: None, cell_alignment: Some(Left), constraint: Some(ContentWidth) }], style: {TopRightCorner: '+', RightHeaderIntersection: '+', LeftBorderIntersections: '|', RightBorderIntersections: '|', BottomRightCorner: '+', RightBorder: '|', MiddleHeaderIntersections: '=', TopLeftCorner: '+', TopBorderIntersections: '+', MiddleIntersections: '+', BottomBorderIntersections: '+', LeftHeaderIntersection: '+', BottomLeftCorner: '+', HorizontalLines: '-', TopBorder: '-', BottomBorder: '-', LeftBorder: '|', VerticalLines: '|', HeaderLines: '='}, header: None, rows: [Row { index: Some(0), cells: [], max_height: None }, Row { index: Some(1), cells: [], max_height: None }, Row { index: Some(2), cells: [Cell { content: [""], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }, Cell { content: ["rz_m___Dksx_c__KdvK__fh"], delimiter: None, alignment: Some(Right), fg: None, bg: None, attributes: [] }, Cell { content: ["i_swmNSsyuOtR_UfklUqR_"], delimiter: None, alignment: Some(Center), fg: None, bg: None, attributes: [] }], max_height: None }, Row { index: Some(3), cells: [Cell { content: ["xJ_iEc_IGix____hf_GPlKlnqKZr_"], delimiter: None, alignment: Some(Left), fg: None, bg: None, attributes: [] }], max_height: None }], arrangement: Dynamic, delimiter: None, no_tty: false, use_stderr: false, width: None, enforce_styling: false, style_text_only: false }, table_width = 77 cc 3a4d50f1e0f97ce25469b6d06fcd1f9b8dcfb4571a6c6c32b3fac1c88ab05606 # shrinks to mut table = Table { columns: [Column { index: 0, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: Some(UpperBoundary(Fixed(23))) }, Column { index: 1, padding: (1, 1), delimiter: None, cell_alignment: None, constraint: None }], style: {HorizontalLines: '-', BottomLeftCorner: '+', RightHeaderIntersection: '+', TopBorder: '-', RightBorder: '|', BottomBorder: '-', MiddleIntersections: '+', HeaderLines: '=', TopLeftCorner: '+', VerticalLines: '|', TopRightCorner: '+', RightBorderIntersections: '|', LeftHeaderIntersection: '+', BottomBorderIntersections: '+', LeftBorder: '|', LeftBorderIntersections: '|', TopBorderIntersections: '+', BottomRightCorner: '+', MiddleHeaderIntersections: '='}, header: None, rows: [Row { index: Some(0), cells: [Cell { content: ["aAAAa_A_aAAaAAaaaaaa_"], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }, Cell { content: [""], delimiter: None, alignment: None, fg: None, bg: None, attributes: [] }], max_height: None }], arrangement: Dynamic, delimiter: None, no_tty: false, use_stderr: false, width: None, enforce_styling: false, style_text_only: false }, table_width = 9 +cc 0bcb3b286fe40082d15d728ad1ec5e90ec19bd0e9beeeeae67edfe6908d14c21