Update foreign-types to 0.3.2 and foreign-types-shared to 0.1.1.
Newer versions require importing foreign-types-macros, but this update
includes license files, so we can get rid of some patches.
Test: treehugger
Change-Id: I9cfad769dc0e18b923aa8934dcc93a16e39f73f1
diff --git a/crates/foreign-types-shared/.android-checksum.json b/crates/foreign-types-shared/.android-checksum.json
index eba03de..213728d 100644
--- a/crates/foreign-types-shared/.android-checksum.json
+++ b/crates/foreign-types-shared/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"7606f80f525587d29c429f46996286db21130dc16e9b3a93aee2bb003f84a1a2","Android.bp":"3c65ccb0d6223c644e7effa6ce3c1a03b2ced2906be1b3fe5868ac528a0f838c","Cargo.toml":"bdce6e7294aef00d293c5127456d2432fee622358b38218cd3b5daea19b05a65","LICENSE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","METADATA":"5b7c1fbdfc42d76e6b2598a97326862669541b44b821868a1b6be38c51ee36b3","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","TEST_MAPPING":"ae340ed9c905486d3fd5f65cac4d9b4c36623a1e78f74214f296558febc75794","cargo_embargo.json":"b2b468228bc38637e56ae43598f527e151c90fca70b1082f50f74f3583fe2822","patches/license.patch":"712d83dddc065a870d949dab330ba1eadece8de9ff4926466db0408fa4fcada1","rules.mk":"85b54fc6bc8caea86d9dce8e5ea3b2623447dda0823ad62c60451aca8fe869b2","src/lib.rs":"a766e995102aa76875bd19e4ac1ccb5b0a041244ce8a2e6d701e688f31ec8116"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"5d7fbb930308624805bdff7bae2970874294ca8b15ea7601dc1790187e53799c","Android.bp":"62969fcc3d70c0b1d106207297eeddaaab6b90da420cd41638e1d0e3ddc73486","Cargo.toml":"02857836a3f7e6ba50397b7a17263c0b78bef7d80a4805e652280ce9ecc1d3f2","LICENSE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"ec125fc6370be3cdbe6933ca4486cbdbc7e9f1fe58c7b2b81f084d8da85a80f4","METADATA":"c1cc337b6e2c1fbdaf420021c538d7d32399f75c4bbbfb5ad498c48873ca637b","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","TEST_MAPPING":"ae340ed9c905486d3fd5f65cac4d9b4c36623a1e78f74214f296558febc75794","cargo_embargo.json":"b2b468228bc38637e56ae43598f527e151c90fca70b1082f50f74f3583fe2822","rules.mk":"85b54fc6bc8caea86d9dce8e5ea3b2623447dda0823ad62c60451aca8fe869b2","src/lib.rs":"a766e995102aa76875bd19e4ac1ccb5b0a041244ce8a2e6d701e688f31ec8116"}}
\ No newline at end of file
diff --git a/crates/foreign-types-shared/.cargo-checksum.json b/crates/foreign-types-shared/.cargo-checksum.json
index 00f8083..2d6d891 100644
--- a/crates/foreign-types-shared/.cargo-checksum.json
+++ b/crates/foreign-types-shared/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"fda4e593f4c625fbf1f3f6538b52643d7d105f8cb4986f820868bc57d0b22db9","src/lib.rs":"77aed289fd36258c273f033e766e572ee05330249083c017d045f0a75662f5df"},"package":"baa1839fc3c5487b5e129ea4f774e3fd84e6c4607127315521bc014a722ebc9e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"6b91ae600fe7b521537096b2269ab7bfd606f8a1fcd97749634dd03ba18daf53","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"333ea3aaa3cadb819f4acd9f9153f9feee060a995ca8710f32bc5bd9a4b91734","src/lib.rs":"77aed289fd36258c273f033e766e572ee05330249083c017d045f0a75662f5df"},"package":"00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"}
\ No newline at end of file
diff --git a/crates/foreign-types-shared/Android.bp b/crates/foreign-types-shared/Android.bp
index 39d862a..f712d48 100644
--- a/crates/foreign-types-shared/Android.bp
+++ b/crates/foreign-types-shared/Android.bp
@@ -18,7 +18,7 @@
host_supported: true,
crate_name: "foreign_types_shared",
cargo_env_compat: true,
- cargo_pkg_version: "0.1.0",
+ cargo_pkg_version: "0.1.1",
crate_root: "src/lib.rs",
edition: "2015",
apex_available: [
diff --git a/crates/foreign-types-shared/Cargo.toml b/crates/foreign-types-shared/Cargo.toml
index 50c3c10..e2cb783 100644
--- a/crates/foreign-types-shared/Cargo.toml
+++ b/crates/foreign-types-shared/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "foreign-types-shared"
-version = "0.1.0"
+version = "0.1.1"
authors = ["Steven Fackler <sfackler@gmail.com>"]
description = "An internal crate used by foreign-types"
license = "MIT/Apache-2.0"
diff --git a/crates/foreign-types-shared/LICENSE-MIT b/crates/foreign-types-shared/LICENSE-MIT
new file mode 100644
index 0000000..bb76d01
--- /dev/null
+++ b/crates/foreign-types-shared/LICENSE-MIT
@@ -0,0 +1,19 @@
+Copyright (c) 2017 The foreign-types Developers
+
+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/crates/foreign-types-shared/METADATA b/crates/foreign-types-shared/METADATA
index 4706262..72c93f4 100644
--- a/crates/foreign-types-shared/METADATA
+++ b/crates/foreign-types-shared/METADATA
@@ -1,17 +1,17 @@
name: "foreign-types-shared"
description: "An internal crate used by foreign-types"
third_party {
- version: "0.1.0"
+ version: "0.1.1"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 4
- day: 27
+ year: 2025
+ month: 1
+ day: 22
}
homepage: "https://crates.io/crates/foreign-types-shared"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.0.crate"
- version: "0.1.0"
+ value: "https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate"
+ version: "0.1.1"
}
}
diff --git a/crates/foreign-types-shared/patches/license.patch b/crates/foreign-types-shared/patches/license.patch
deleted file mode 100644
index 3bdb7bc..0000000
--- a/crates/foreign-types-shared/patches/license.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff --git b/LICENSE-APACHE a/LICENSE-APACHE
-new file mode 100644
-index 0000000..8f71f43
---- /dev/null
-+++ a/LICENSE-APACHE
-@@ -0,0 +1,202 @@
-+ 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/crates/foreign-types/.android-checksum.json b/crates/foreign-types/.android-checksum.json
index cbc155d..10143a5 100644
--- a/crates/foreign-types/.android-checksum.json
+++ b/crates/foreign-types/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"dcb70d33c088dfd1f118dd398f8a0db4483e1be82b028c29f26cc891a6bfef2b","Android.bp":"bc21c6c3140ad5635594613f887dedc082940c7ab45c29a3147a1d9aab00161d","Cargo.toml":"66d6533c964754dd80f0256b1da8999b99969562f16c6ed60f627f14fc75b63c","LICENSE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","METADATA":"3d156019a7db0876e1bad4802b44f075342bdeceac79113f19483d1e447ed631","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"102ceeee1358f7b71f8995ab6e7eb6b5a2cdb760aa614a4739c7701f5db41d2f","TEST_MAPPING":"ae340ed9c905486d3fd5f65cac4d9b4c36623a1e78f74214f296558febc75794","cargo_embargo.json":"a68709164282b76592f7230cec3ac8958da2e7018bd4cd0551a21ce3f7db2949","patches/license.patch":"712d83dddc065a870d949dab330ba1eadece8de9ff4926466db0408fa4fcada1","rules.mk":"93e2593869f8338b8a65dbfac5fc0402ed1367e91397190571cf70eca5a3f792","src/lib.rs":"a081b891701b80c6bd223e2d4382604826f13ac30018f7208018d64294082b95"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"cbde4b1900647f6c3d0d3683774e6230df0e1d048fb5dae1947e26fd0c54ed3a","Android.bp":"283aa3a1e37c6a5b67d29b2686714d889d757a3b24a2f2bc5d03859e2d660b72","Cargo.toml":"92af2a36eec26267eab9d0b2bd236d5059ccd2cd859fe4b80220f18a6d1fe82a","LICENSE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-APACHE":"e4493d0badd82c469fd611cf0c31ea8a74cce85c52c4a4c2579e344226f0602e","LICENSE-MIT":"ec125fc6370be3cdbe6933ca4486cbdbc7e9f1fe58c7b2b81f084d8da85a80f4","METADATA":"4a94d8fdf34cc42bfd3d2c9929be057a9aefadca788cdb79a823c17b9badf97a","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"102ceeee1358f7b71f8995ab6e7eb6b5a2cdb760aa614a4739c7701f5db41d2f","TEST_MAPPING":"ae340ed9c905486d3fd5f65cac4d9b4c36623a1e78f74214f296558febc75794","cargo_embargo.json":"a68709164282b76592f7230cec3ac8958da2e7018bd4cd0551a21ce3f7db2949","rules.mk":"93e2593869f8338b8a65dbfac5fc0402ed1367e91397190571cf70eca5a3f792","src/lib.rs":"a081b891701b80c6bd223e2d4382604826f13ac30018f7208018d64294082b95"}}
\ No newline at end of file
diff --git a/crates/foreign-types/.cargo-checksum.json b/crates/foreign-types/.cargo-checksum.json
index 74b142b..7e74bd5 100644
--- a/crates/foreign-types/.cargo-checksum.json
+++ b/crates/foreign-types/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"28b81b0bda8983da4ab95650b73ca5cfb5c6fa9400be5d6643fb761fb21b2c13","README.md":"6f3f1429f2724a481df811842f318d0d3b83160ada953fd869d4b685f7fd72e4","src/lib.rs":"4f0a33bf8ec94a57d1b71e50f1af8ca410985e447f69fdc9c680545b03ea4566"},"package":"a21b40436003b2a1e22483c5ed6c3d25e755b6b3120f601cc22aa57e25dc9065"}
\ No newline at end of file
+{"files":{"Cargo.toml":"1a667c28f60115423b68fea369255c2dcb129b8dce10f30e0e1da73d05f9adab","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"333ea3aaa3cadb819f4acd9f9153f9feee060a995ca8710f32bc5bd9a4b91734","README.md":"6f3f1429f2724a481df811842f318d0d3b83160ada953fd869d4b685f7fd72e4","src/lib.rs":"4f0a33bf8ec94a57d1b71e50f1af8ca410985e447f69fdc9c680545b03ea4566"},"package":"f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"}
\ No newline at end of file
diff --git a/crates/foreign-types/Android.bp b/crates/foreign-types/Android.bp
index 7768110..b321a6f 100644
--- a/crates/foreign-types/Android.bp
+++ b/crates/foreign-types/Android.bp
@@ -18,7 +18,7 @@
host_supported: true,
crate_name: "foreign_types",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.1",
+ cargo_pkg_version: "0.3.2",
crate_root: "src/lib.rs",
edition: "2015",
rustlibs: ["libforeign_types_shared"],
diff --git a/crates/foreign-types/Cargo.toml b/crates/foreign-types/Cargo.toml
index 925194b..6ff5567 100644
--- a/crates/foreign-types/Cargo.toml
+++ b/crates/foreign-types/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "foreign-types"
-version = "0.3.1"
+version = "0.3.2"
authors = ["Steven Fackler <sfackler@gmail.com>"]
description = "A framework for Rust wrappers over C APIs"
readme = "README.md"
diff --git a/crates/foreign-types/LICENSE-MIT b/crates/foreign-types/LICENSE-MIT
new file mode 100644
index 0000000..bb76d01
--- /dev/null
+++ b/crates/foreign-types/LICENSE-MIT
@@ -0,0 +1,19 @@
+Copyright (c) 2017 The foreign-types Developers
+
+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/crates/foreign-types/METADATA b/crates/foreign-types/METADATA
index 592b299..ec77274 100644
--- a/crates/foreign-types/METADATA
+++ b/crates/foreign-types/METADATA
@@ -1,17 +1,17 @@
name: "foreign-types"
description: "A framework for Rust wrappers over C APIs"
third_party {
- version: "0.3.1"
+ version: "0.3.2"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 4
- day: 27
+ year: 2025
+ month: 1
+ day: 22
}
homepage: "https://crates.io/crates/foreign-types"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/foreign-types/foreign-types-0.3.1.crate"
- version: "0.3.1"
+ value: "https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate"
+ version: "0.3.2"
}
}
diff --git a/crates/foreign-types/patches/license.patch b/crates/foreign-types/patches/license.patch
deleted file mode 100644
index 3bdb7bc..0000000
--- a/crates/foreign-types/patches/license.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff --git b/LICENSE-APACHE a/LICENSE-APACHE
-new file mode 100644
-index 0000000..8f71f43
---- /dev/null
-+++ a/LICENSE-APACHE
-@@ -0,0 +1,202 @@
-+ 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/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index 8abe96d..c1fa22a 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -195,8 +195,8 @@
"flate2",
"fnv",
"foldhash",
- "foreign-types 0.3.1",
- "foreign-types-shared 0.1.0",
+ "foreign-types 0.3.2",
+ "foreign-types-shared 0.1.1",
"form_urlencoded",
"fragile",
"fs-err",
@@ -2054,11 +2054,11 @@
[[package]]
name = "foreign-types"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21b40436003b2a1e22483c5ed6c3d25e755b6b3120f601cc22aa57e25dc9065"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
- "foreign-types-shared 0.1.0",
+ "foreign-types-shared 0.1.1",
]
[[package]]
@@ -2084,9 +2084,9 @@
[[package]]
name = "foreign-types-shared"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baa1839fc3c5487b5e129ea4f774e3fd84e6c4607127315521bc014a722ebc9e"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "foreign-types-shared"
@@ -3631,7 +3631,7 @@
dependencies = [
"bitflags 2.8.0",
"cfg-if",
- "foreign-types 0.3.1",
+ "foreign-types 0.3.2",
"libc",
"once_cell",
"openssl-macros",
diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 6f59644..1fc24ef 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -110,8 +110,8 @@
flate2 = "=1.0.35"
fnv = "=1.0.7"
foldhash = "=0.1.3"
-foreign-types = "=0.3.1"
-foreign-types-shared = "=0.1.0"
+foreign-types = "=0.3.2"
+foreign-types-shared = "=0.1.1"
form_urlencoded = "=1.2.1"
fragile = "=2.0.0"
fs-err = "=2.11.0"
