diff options
author | Joel Galenson <jgalenson@google.com> | 2021-08-11 16:00:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 16:00:28 +0000 |
commit | 964526cc306b525a81d2ea4c53e89f60f3f2f1b2 (patch) | |
tree | b4d3be92288b3a5010750233ca15b60145381a4a | |
parent | ccdca54713652c380635317591483c3d9fba4512 (diff) | |
parent | ad8754e5bb3e0aecc3ea66aca99bd04b4fd441df (diff) | |
download | criterion-plot-964526cc306b525a81d2ea4c53e89f60f3f2f1b2.tar.gz |
Upgrade rust/crates/criterion-plot to 0.4.4 am: aed7adac55 am: ad8754e5bb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion-plot/+/1791047
Change-Id: Ibd9530cefc9572573263f52665ff2ba2163d4c34
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 9 | ||||
-rwxr-xr-x | CONTRIBUTING.md | 77 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rwxr-xr-x | Cargo.toml.orig | 4 | ||||
-rwxr-xr-x | LICENSE-APACHE | 202 | ||||
-rwxr-xr-x | LICENSE-MIT | 26 | ||||
-rw-r--r-- | METADATA | 10 |
8 files changed, 316 insertions, 18 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 931fc83..1abeeed 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "3fcbcd237e14306d102f2ea2f1285cd6285e086c" + "sha1": "97a70ee543c8984ce21c56824099fcfb96554c80" } } @@ -39,9 +39,8 @@ rust_library { } // dependent_library ["feature_list"] -// cast-0.2.3 "default,std" +// cast-0.2.7 "default,std" // either-1.6.1 -// itertools-0.9.0 "default,use_std" -// rustc_version-0.2.3 -// semver-0.9.0 "default" -// semver-parser-0.7.0 +// itertools-0.10.1 "default,use_alloc,use_std" +// rustc_version-0.4.0 +// semver-1.0.4 "default,std" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 44fcc63..be5026b 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1,76 @@ -../CONTRIBUTING.md
\ No newline at end of file +# Contributing to Criterion.<span></span>rs + +## Ideas, Experiences and Questions + +The easiest way to contribute to Criterion.<span></span>rs is to use it and report your experiences, ask questions and contribute ideas. We'd love to hear your thoughts on how to make Criterion.<span></span>rs better, or your comments on why you are or are not currently using it. + +Issues, ideas, requests and questions should be posted on the issue tracker at: + +https://github.com/bheisler/criterion.rs/issues + +## A Note on Dependency Updates + +Criterion.<span></span>rs does not accept pull requests to update dependencies unless specifically +requested by the maintaner(s). Dependencies are updated manually by the maintainer(s) before each +new release. + +## Code + +Pull requests are welcome, though please raise an issue for discussion first if none exists. We're happy to assist new contributors. + +If you're not sure what to work on, try checking the [Beginner label](https://github.com/bheisler/criterion.rs/issues?q=is%3Aissue+is%3Aopen+label%3ABeginner) + +To make changes to the code, fork the repo and clone it: + +`git clone git@github.com:your-username/criterion.rs.git` + +You'll probably want to install [gnuplot](http://www.gnuplot.info/) as well. See the gnuplot website for installation instructions. + +Then make your changes to the code. When you're done, run the tests: + +``` +cargo test --all +cargo bench +``` + +It's a good idea to run clippy and fix any warnings as well: + +``` +rustup component add clippy-preview +cargo clippy --all +``` + +Finally, run Rustfmt to maintain a common code style: + +``` +rustup component add rustfmt-preview +cargo fmt --all +``` + +Don't forget to update the CHANGELOG.md file and any appropriate documentation. Once you're finished, push to your fork and submit a pull request. We try to respond to new issues and pull requests quickly, so if there hasn't been any response for more than a few days feel free to ping @bheisler. + +Some things that will increase the chance that your pull request is accepted: + +* Write tests +* Clearly document public methods +* Write a good commit message + +## Github Labels + +Criterion.<span></span>rs uses a simple set of labels to track issues. Most important are the +difficulty labels: + +* Beginner - Suitable for people new to Criterion.rs, or even new to Rust in general +* Intermediate - More challenging, likely involves some non-trivial design decisions and/or knowledge + of Criterion.<span></span>rs' internals +* Bigger Project - Large and/or complex project such as designing a complex new feature + +Additionally, there are a few other noteworthy labels: + +* Breaking Change - Fixing this will have to wait until the next breaking-change release +* Bug - Something isn't working right +* Enhancement - Request to add a new feature or otherwise improve Criterion.<span></span>rs in some way + +## Code of Conduct + +We follow the [Rust Code of Conduct](http://www.rust-lang.org/conduct.html). @@ -13,7 +13,7 @@ [package] edition = "2018" name = "criterion-plot" -version = "0.4.3" +version = "0.4.4" authors = ["Jorge Aparicio <japaricious@gmail.com>", "Brook Heisler <brookheisler@gmail.com>"] description = "Criterion's plotting library" readme = "README.md" @@ -25,7 +25,7 @@ repository = "https://github.com/bheisler/criterion.rs" version = "0.2" [dependencies.itertools] -version = "0.9" +version = "0.10" [dev-dependencies.itertools-num] version = "0.1" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 162931a..76e0064 100755 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] authors = ["Jorge Aparicio <japaricious@gmail.com>", "Brook Heisler <brookheisler@gmail.com>"] name = "criterion-plot" -version = "0.4.3" +version = "0.4.4" edition = "2018" description = "Criterion's plotting library" @@ -13,7 +13,7 @@ license = "MIT/Apache-2.0" [dependencies] cast = "0.2" -itertools = "0.9" +itertools = "0.10" [dev-dependencies] itertools-num = "0.1" diff --git a/LICENSE-APACHE b/LICENSE-APACHE index 965b606..16fe87b 100755 --- a/LICENSE-APACHE +++ b/LICENSE-APACHE @@ -1 +1,201 @@ -../LICENSE-APACHE
\ No newline at end of file + 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/LICENSE-MIT b/LICENSE-MIT index 76219eb..ac0fda0 100755 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1 +1,25 @@ -../LICENSE-MIT
\ No newline at end of file +Copyright (c) 2014 Jorge Aparicio + +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. @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/criterion-plot/criterion-plot-0.4.3.crate" + value: "https://static.crates.io/crates/criterion-plot/criterion-plot-0.4.4.crate" } - version: "0.4.3" + version: "0.4.4" license_type: NOTICE last_upgrade_date { - year: 2020 - month: 12 - day: 21 + year: 2021 + month: 8 + day: 9 } } |