diff options
author | Andrew Walbran <qwandor@google.com> | 2023-06-01 20:07:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-01 20:07:31 +0000 |
commit | e27fc2609b70e345870150b628c17e32049eb9c1 (patch) | |
tree | 088df8be1c1eaf0765bfddd1b13e7f329d1fb356 | |
parent | 8c465ee650ff0c9289800fdcdd5b8a7d37361364 (diff) | |
parent | 2d2223f60c9c0d444d044a983e9acaac74074b22 (diff) | |
download | linkme-impl-e27fc2609b70e345870150b628c17e32049eb9c1.tar.gz |
Upgrade linkme-impl to 0.3.10 am: 9a4eb57280 am: ca6bc95e0f am: 03443203d4 am: 2d2223f60c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/linkme-impl/+/2609776
Change-Id: Ibb9ca7dafd942f6a6762b92314e90d7088e2991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | LICENSE-APACHE | 176 | ||||
-rw-r--r-- | LICENSE-MIT | 23 | ||||
-rw-r--r-- | METADATA | 15 | ||||
-rw-r--r-- | src/declaration.rs | 20 |
8 files changed, 24 insertions, 218 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index a449620..c7c5521 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "a0c3cdd977aefdf6674754ca8b1dc4aa41a7f0ae" + "sha1": "65a95be8ada66b31382af7b669ffb594b5c1e7e0" }, "path_in_vcs": "impl" }
\ No newline at end of file @@ -7,7 +7,7 @@ rust_proc_macro { name: "liblinkme_impl", crate_name: "linkme_impl", cargo_env_compat: true, - cargo_pkg_version: "0.3.9", + cargo_pkg_version: "0.3.10", srcs: ["src/lib.rs"], edition: "2021", rustlibs: [ @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.62" name = "linkme-impl" -version = "0.3.9" +version = "0.3.10" authors = ["David Tolnay <dtolnay@gmail.com>"] description = "Implementation detail of the linkme crate" documentation = "https://docs.rs/linkme" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 694b1c2..e602f36 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "linkme-impl" -version = "0.3.9" +version = "0.3.10" authors = ["David Tolnay <dtolnay@gmail.com>"] description = "Implementation detail of the linkme crate" documentation = "https://docs.rs/linkme" diff --git a/LICENSE-APACHE b/LICENSE-APACHE deleted file mode 100644 index 1b5ec8b..0000000 --- a/LICENSE-APACHE +++ /dev/null @@ -1,176 +0,0 @@ - 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-MIT b/LICENSE-MIT deleted file mode 100644 index 31aa793..0000000 --- a/LICENSE-MIT +++ /dev/null @@ -1,23 +0,0 @@ -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. @@ -1,5 +1,9 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update rust/crates/linkme-impl +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "linkme-impl" -description: "Safe cross-platform linker shenanigans" +description: "Implementation detail of the linkme crate" third_party { url { type: HOMEPAGE @@ -7,14 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/linkme/linkme-impl-0.3.9.crate" + value: "https://static.crates.io/crates/linkme-impl/linkme-impl-0.3.10.crate" } - version: "0.3.9" - # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same. + version: "0.3.10" license_type: NOTICE last_upgrade_date { year: 2023 - month: 5 - day: 9 + month: 6 + day: 1 } } diff --git a/src/declaration.rs b/src/declaration.rs index 7543bad..4d1d9e3 100644 --- a/src/declaration.rs +++ b/src/declaration.rs @@ -123,29 +123,30 @@ pub fn expand(input: TokenStream) -> TokenStream { target_os = "macos", target_os = "ios", target_os = "tvos", + target_os = "android", target_os = "illumos", target_os = "freebsd", ))] extern "Rust" { - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_section_start)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_section_start)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_start)] #[cfg_attr(target_os = "illumos", link_name = #illumos_section_start)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_start)] static LINKME_START: <#ty as #linkme_path::__private::Slice>::Element; - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_section_stop)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_section_stop)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_stop)] #[cfg_attr(target_os = "illumos", link_name = #illumos_section_stop)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_stop)] static LINKME_STOP: <#ty as #linkme_path::__private::Slice>::Element; - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_start)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_dupcheck_start)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_start)] #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_start)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_start)] static DUPCHECK_START: #linkme_path::__private::usize; - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_stop)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_name = #linux_dupcheck_stop)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_stop)] #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_stop)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_stop)] @@ -169,14 +170,14 @@ pub fn expand(input: TokenStream) -> TokenStream { static DUPCHECK_STOP: () = (); #used - #[cfg(any(target_os = "none", target_os = "linux", target_os = "illumos", target_os = "freebsd"))] - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_section)] + #[cfg(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "illumos", target_os = "freebsd"))] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_section)] #[cfg_attr(target_os = "illumos", link_section = #illumos_section)] #[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)] static mut LINKME_PLEASE: [<#ty as #linkme_path::__private::Slice>::Element; 0] = []; #used - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_dupcheck)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_dupcheck)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_dupcheck)] #[cfg_attr(target_os = "windows", link_section = #windows_dupcheck)] #[cfg_attr(target_os = "illumos", link_section = #illumos_dupcheck)] @@ -190,6 +191,7 @@ pub fn expand(input: TokenStream) -> TokenStream { target_os = "ios", target_os = "tvos", target_os = "windows", + target_os = "android", target_os = "illumos", target_os = "freebsd", )))] @@ -236,7 +238,7 @@ pub fn expand(input: TokenStream) -> TokenStream { $item:item ) => { #used - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = $linux_section)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = $linux_section)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = $macho_section)] #[cfg_attr(target_os = "windows", link_section = $windows_section)] #[cfg_attr(target_os = "illumos", link_section = $illumos_section)] @@ -245,7 +247,7 @@ pub fn expand(input: TokenStream) -> TokenStream { }; ($item:item) => { #used - #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_section)] + #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android"), link_section = #linux_section)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_section)] #[cfg_attr(target_os = "windows", link_section = #windows_section)] #[cfg_attr(target_os = "illumos", link_section = #illumos_section)] |