Merge remote-tracking branch 'origin/upstream' am: a3fcb756a5 am: a36ed2b1b9
Original change: undetermined
Change-Id: I9a2e7171ec2027486cca3f186ed2325b655f0e2a
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..c155f70
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,60 @@
+// This file is generated by cargo_embargo.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
+
+package {
+ default_applicable_licenses: ["external_rust_crates_libtokio_io_timeout_license"],
+}
+
+license {
+ name: "external_rust_crates_libtokio_io_timeout_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
+rust_library {
+ name: "libtokio_io_timeout",
+ host_supported: true,
+ crate_name: "tokio_io_timeout",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.2.0",
+ crate_root: "src/lib.rs",
+ edition: "2018",
+ rustlibs: [
+ "libpin_project_lite",
+ "libtokio",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ product_available: true,
+ vendor_available: true,
+}
+
+rust_test {
+ name: "tokio-io-timeout_test_src_lib",
+ host_supported: true,
+ crate_name: "tokio_io_timeout",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.2.0",
+ crate_root: "src/lib.rs",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2018",
+ rustlibs: [
+ "libpin_project_lite",
+ "libtokio",
+ ],
+}
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..ba482ec
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,29 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2018"
+name = "tokio-io-timeout"
+version = "1.2.0"
+authors = ["Steven Fackler <[email protected]>"]
+description = "Tokio wrappers which apply timeouts to IO operations"
+readme = "README.md"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/sfackler/tokio-io-timeout"
+[dependencies.pin-project-lite]
+version = "0.2"
+
+[dependencies.tokio]
+version = "1.0"
+features = ["time"]
+[dev-dependencies.tokio]
+version = "1.0"
+features = ["full"]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
new file mode 100644
index 0000000..ee6acfd
--- /dev/null
+++ b/Cargo.toml.orig
@@ -0,0 +1,16 @@
+[package]
+name = "tokio-io-timeout"
+version = "1.2.0"
+authors = ["Steven Fackler <[email protected]>"]
+license = "MIT/Apache-2.0"
+description = "Tokio wrappers which apply timeouts to IO operations"
+repository = "https://github.com/sfackler/tokio-io-timeout"
+readme = "README.md"
+edition = "2018"
+
+[dependencies]
+pin-project-lite = "0.2"
+tokio = { version = "1.0", features = ["time"] }
+
+[dev-dependencies]
+tokio = { version = "1.0", features = ["full"] }
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f1c48d0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,223 @@
+ 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.
+
+-----
+
+Copyright (c) 2017 The tokio-io-timeout 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/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..8f71f43
--- /dev/null
+++ b/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/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..dc23cd5
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,19 @@
+Copyright (c) 2017 The tokio-io-timeout 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/METADATA b/METADATA
new file mode 100644
index 0000000..3726ce5
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,21 @@
+name: "tokio-io-timeout"
+description: "Tokio wrappers which apply timeouts to IO operations"
+third_party {
+ identifier {
+ type: "crates.io"
+ value: "tokio-io-timeout"
+ }
+ identifier {
+ type: "Archive"
+ value: "https://static.crates.io/crates/tokio-io-timeout/tokio-io-timeout-1.2.0.crate"
+ primary_source: true
+ }
+ version: "1.2.0"
+ # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2024
+ month: 6
+ day: 3
+ }
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..48bea6e
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 688011
+include platform/prebuilts/rust:main:/OWNERS
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4b2510d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# tokio-io-timeout
+[](https://circleci.com/gh/sfackler/tokio-io-timeout)
+
+[Documentation](https://docs.rs/tokio-io-timeout)
+
+Tokio wrappers which apply timeouts to IO operations.
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally
+submitted for inclusion in the work by you, as defined in the Apache-2.0
+license, shall be dual licensed as above, without any additional terms or
+conditions.
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..670f827
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,628 @@
+//! Tokio wrappers which apply timeouts to IO operations.
+//!
+//! These timeouts are analogous to the read and write timeouts on traditional blocking sockets. A timeout countdown is
+//! initiated when a read/write operation returns [`Poll::Pending`]. If a read/write does not return successfully before
+//! the countdown expires, an [`io::Error`] with a kind of [`TimedOut`](io::ErrorKind::TimedOut) is returned.
+#![doc(html_root_url = "https://docs.rs/tokio-io-timeout/1")]
+#![warn(missing_docs)]
+
+use pin_project_lite::pin_project;
+use std::future::Future;
+use std::io;
+use std::io::SeekFrom;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+use tokio::io::{AsyncRead, AsyncSeek, AsyncWrite, ReadBuf};
+use tokio::time::{sleep_until, Instant, Sleep};
+
+pin_project! {
+ #[derive(Debug)]
+ struct TimeoutState {
+ timeout: Option<Duration>,
+ #[pin]
+ cur: Sleep,
+ active: bool,
+ }
+}
+
+impl TimeoutState {
+ #[inline]
+ fn new() -> TimeoutState {
+ TimeoutState {
+ timeout: None,
+ cur: sleep_until(Instant::now()),
+ active: false,
+ }
+ }
+
+ #[inline]
+ fn timeout(&self) -> Option<Duration> {
+ self.timeout
+ }
+
+ #[inline]
+ fn set_timeout(&mut self, timeout: Option<Duration>) {
+ // since this takes &mut self, we can't yet be active
+ self.timeout = timeout;
+ }
+
+ #[inline]
+ fn set_timeout_pinned(mut self: Pin<&mut Self>, timeout: Option<Duration>) {
+ *self.as_mut().project().timeout = timeout;
+ self.reset();
+ }
+
+ #[inline]
+ fn reset(self: Pin<&mut Self>) {
+ let this = self.project();
+
+ if *this.active {
+ *this.active = false;
+ this.cur.reset(Instant::now());
+ }
+ }
+
+ #[inline]
+ fn poll_check(self: Pin<&mut Self>, cx: &mut Context<'_>) -> io::Result<()> {
+ let mut this = self.project();
+
+ let timeout = match this.timeout {
+ Some(timeout) => *timeout,
+ None => return Ok(()),
+ };
+
+ if !*this.active {
+ this.cur.as_mut().reset(Instant::now() + timeout);
+ *this.active = true;
+ }
+
+ match this.cur.poll(cx) {
+ Poll::Ready(()) => Err(io::Error::from(io::ErrorKind::TimedOut)),
+ Poll::Pending => Ok(()),
+ }
+ }
+}
+
+pin_project! {
+ /// An `AsyncRead`er which applies a timeout to read operations.
+ #[derive(Debug)]
+ pub struct TimeoutReader<R> {
+ #[pin]
+ reader: R,
+ #[pin]
+ state: TimeoutState,
+ }
+}
+
+impl<R> TimeoutReader<R>
+where
+ R: AsyncRead,
+{
+ /// Returns a new `TimeoutReader` wrapping the specified reader.
+ ///
+ /// There is initially no timeout.
+ pub fn new(reader: R) -> TimeoutReader<R> {
+ TimeoutReader {
+ reader,
+ state: TimeoutState::new(),
+ }
+ }
+
+ /// Returns the current read timeout.
+ pub fn timeout(&self) -> Option<Duration> {
+ self.state.timeout()
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This can only be used before the reader is pinned; use [`set_timeout_pinned`](Self::set_timeout_pinned)
+ /// otherwise.
+ pub fn set_timeout(&mut self, timeout: Option<Duration>) {
+ self.state.set_timeout(timeout);
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This will reset any pending timeout. Use [`set_timeout`](Self::set_timeout) instead if the reader is not yet
+ /// pinned.
+ pub fn set_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project().state.set_timeout_pinned(timeout);
+ }
+
+ /// Returns a shared reference to the inner reader.
+ pub fn get_ref(&self) -> &R {
+ &self.reader
+ }
+
+ /// Returns a mutable reference to the inner reader.
+ pub fn get_mut(&mut self) -> &mut R {
+ &mut self.reader
+ }
+
+ /// Returns a pinned mutable reference to the inner reader.
+ pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut R> {
+ self.project().reader
+ }
+
+ /// Consumes the `TimeoutReader`, returning the inner reader.
+ pub fn into_inner(self) -> R {
+ self.reader
+ }
+}
+
+impl<R> AsyncRead for TimeoutReader<R>
+where
+ R: AsyncRead,
+{
+ fn poll_read(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ buf: &mut ReadBuf<'_>,
+ ) -> Poll<Result<(), io::Error>> {
+ let this = self.project();
+ let r = this.reader.poll_read(cx, buf);
+ match r {
+ Poll::Pending => this.state.poll_check(cx)?,
+ _ => this.state.reset(),
+ }
+ r
+ }
+}
+
+impl<R> AsyncWrite for TimeoutReader<R>
+where
+ R: AsyncWrite,
+{
+ fn poll_write(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ buf: &[u8],
+ ) -> Poll<Result<usize, io::Error>> {
+ self.project().reader.poll_write(cx, buf)
+ }
+
+ fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ self.project().reader.poll_flush(cx)
+ }
+
+ fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ self.project().reader.poll_shutdown(cx)
+ }
+
+ fn poll_write_vectored(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ bufs: &[io::IoSlice<'_>],
+ ) -> Poll<io::Result<usize>> {
+ self.project().reader.poll_write_vectored(cx, bufs)
+ }
+
+ fn is_write_vectored(&self) -> bool {
+ self.reader.is_write_vectored()
+ }
+}
+
+impl<R> AsyncSeek for TimeoutReader<R>
+where
+ R: AsyncSeek,
+{
+ fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> io::Result<()> {
+ self.project().reader.start_seek(position)
+ }
+ fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+ self.project().reader.poll_complete(cx)
+ }
+}
+
+pin_project! {
+ /// An `AsyncWrite`er which applies a timeout to write operations.
+ #[derive(Debug)]
+ pub struct TimeoutWriter<W> {
+ #[pin]
+ writer: W,
+ #[pin]
+ state: TimeoutState,
+ }
+}
+
+impl<W> TimeoutWriter<W>
+where
+ W: AsyncWrite,
+{
+ /// Returns a new `TimeoutReader` wrapping the specified reader.
+ ///
+ /// There is initially no timeout.
+ pub fn new(writer: W) -> TimeoutWriter<W> {
+ TimeoutWriter {
+ writer,
+ state: TimeoutState::new(),
+ }
+ }
+
+ /// Returns the current write timeout.
+ pub fn timeout(&self) -> Option<Duration> {
+ self.state.timeout()
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This can only be used before the writer is pinned; use [`set_timeout_pinned`](Self::set_timeout_pinned)
+ /// otherwise.
+ pub fn set_timeout(&mut self, timeout: Option<Duration>) {
+ self.state.set_timeout(timeout);
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This will reset any pending timeout. Use [`set_timeout`](Self::set_timeout) instead if the reader is not yet
+ /// pinned.
+ pub fn set_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project().state.set_timeout_pinned(timeout);
+ }
+
+ /// Returns a shared reference to the inner writer.
+ pub fn get_ref(&self) -> &W {
+ &self.writer
+ }
+
+ /// Returns a mutable reference to the inner writer.
+ pub fn get_mut(&mut self) -> &mut W {
+ &mut self.writer
+ }
+
+ /// Returns a pinned mutable reference to the inner writer.
+ pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut W> {
+ self.project().writer
+ }
+
+ /// Consumes the `TimeoutWriter`, returning the inner writer.
+ pub fn into_inner(self) -> W {
+ self.writer
+ }
+}
+
+impl<W> AsyncWrite for TimeoutWriter<W>
+where
+ W: AsyncWrite,
+{
+ fn poll_write(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ buf: &[u8],
+ ) -> Poll<Result<usize, io::Error>> {
+ let this = self.project();
+ let r = this.writer.poll_write(cx, buf);
+ match r {
+ Poll::Pending => this.state.poll_check(cx)?,
+ _ => this.state.reset(),
+ }
+ r
+ }
+
+ fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ let this = self.project();
+ let r = this.writer.poll_flush(cx);
+ match r {
+ Poll::Pending => this.state.poll_check(cx)?,
+ _ => this.state.reset(),
+ }
+ r
+ }
+
+ fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ let this = self.project();
+ let r = this.writer.poll_shutdown(cx);
+ match r {
+ Poll::Pending => this.state.poll_check(cx)?,
+ _ => this.state.reset(),
+ }
+ r
+ }
+
+ fn poll_write_vectored(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ bufs: &[io::IoSlice<'_>],
+ ) -> Poll<io::Result<usize>> {
+ let this = self.project();
+ let r = this.writer.poll_write_vectored(cx, bufs);
+ match r {
+ Poll::Pending => this.state.poll_check(cx)?,
+ _ => this.state.reset(),
+ }
+ r
+ }
+
+ fn is_write_vectored(&self) -> bool {
+ self.writer.is_write_vectored()
+ }
+}
+
+impl<W> AsyncRead for TimeoutWriter<W>
+where
+ W: AsyncRead,
+{
+ fn poll_read(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ buf: &mut ReadBuf<'_>,
+ ) -> Poll<Result<(), io::Error>> {
+ self.project().writer.poll_read(cx, buf)
+ }
+}
+
+impl<W> AsyncSeek for TimeoutWriter<W>
+where
+ W: AsyncSeek,
+{
+ fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> io::Result<()> {
+ self.project().writer.start_seek(position)
+ }
+ fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+ self.project().writer.poll_complete(cx)
+ }
+}
+
+pin_project! {
+ /// A stream which applies read and write timeouts to an inner stream.
+ #[derive(Debug)]
+ pub struct TimeoutStream<S> {
+ #[pin]
+ stream: TimeoutReader<TimeoutWriter<S>>
+ }
+}
+
+impl<S> TimeoutStream<S>
+where
+ S: AsyncRead + AsyncWrite,
+{
+ /// Returns a new `TimeoutStream` wrapping the specified stream.
+ ///
+ /// There is initially no read or write timeout.
+ pub fn new(stream: S) -> TimeoutStream<S> {
+ let writer = TimeoutWriter::new(stream);
+ let stream = TimeoutReader::new(writer);
+ TimeoutStream { stream }
+ }
+
+ /// Returns the current read timeout.
+ pub fn read_timeout(&self) -> Option<Duration> {
+ self.stream.timeout()
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This can only be used before the stream is pinned; use
+ /// [`set_read_timeout_pinned`](Self::set_read_timeout_pinned) otherwise.
+ pub fn set_read_timeout(&mut self, timeout: Option<Duration>) {
+ self.stream.set_timeout(timeout)
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This will reset any pending read timeout. Use [`set_read_timeout`](Self::set_read_timeout) instead if the stream
+ /// has not yet been pinned.
+ pub fn set_read_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project().stream.set_timeout_pinned(timeout)
+ }
+
+ /// Returns the current write timeout.
+ pub fn write_timeout(&self) -> Option<Duration> {
+ self.stream.get_ref().timeout()
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This can only be used before the stream is pinned; use
+ /// [`set_write_timeout_pinned`](Self::set_write_timeout_pinned) otherwise.
+ pub fn set_write_timeout(&mut self, timeout: Option<Duration>) {
+ self.stream.get_mut().set_timeout(timeout)
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This will reset any pending write timeout. Use [`set_write_timeout`](Self::set_write_timeout) instead if the
+ /// stream has not yet been pinned.
+ pub fn set_write_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project()
+ .stream
+ .get_pin_mut()
+ .set_timeout_pinned(timeout)
+ }
+
+ /// Returns a shared reference to the inner stream.
+ pub fn get_ref(&self) -> &S {
+ self.stream.get_ref().get_ref()
+ }
+
+ /// Returns a mutable reference to the inner stream.
+ pub fn get_mut(&mut self) -> &mut S {
+ self.stream.get_mut().get_mut()
+ }
+
+ /// Returns a pinned mutable reference to the inner stream.
+ pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut S> {
+ self.project().stream.get_pin_mut().get_pin_mut()
+ }
+
+ /// Consumes the stream, returning the inner stream.
+ pub fn into_inner(self) -> S {
+ self.stream.into_inner().into_inner()
+ }
+}
+
+impl<S> AsyncRead for TimeoutStream<S>
+where
+ S: AsyncRead + AsyncWrite,
+{
+ fn poll_read(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ buf: &mut ReadBuf<'_>,
+ ) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_read(cx, buf)
+ }
+}
+
+impl<S> AsyncWrite for TimeoutStream<S>
+where
+ S: AsyncRead + AsyncWrite,
+{
+ fn poll_write(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ buf: &[u8],
+ ) -> Poll<Result<usize, io::Error>> {
+ self.project().stream.poll_write(cx, buf)
+ }
+
+ fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_flush(cx)
+ }
+
+ fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_shutdown(cx)
+ }
+
+ fn poll_write_vectored(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ bufs: &[io::IoSlice<'_>],
+ ) -> Poll<io::Result<usize>> {
+ self.project().stream.poll_write_vectored(cx, bufs)
+ }
+
+ fn is_write_vectored(&self) -> bool {
+ self.stream.is_write_vectored()
+ }
+}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+ use std::io::Write;
+ use std::net::TcpListener;
+ use std::thread;
+ use tokio::io::{AsyncReadExt, AsyncWriteExt};
+ use tokio::net::TcpStream;
+ use tokio::pin;
+
+ pin_project! {
+ struct DelayStream {
+ #[pin]
+ sleep: Sleep,
+ }
+ }
+
+ impl DelayStream {
+ fn new(until: Instant) -> Self {
+ DelayStream {
+ sleep: sleep_until(until),
+ }
+ }
+ }
+
+ impl AsyncRead for DelayStream {
+ fn poll_read(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ _buf: &mut ReadBuf,
+ ) -> Poll<Result<(), io::Error>> {
+ match self.project().sleep.poll(cx) {
+ Poll::Ready(()) => Poll::Ready(Ok(())),
+ Poll::Pending => Poll::Pending,
+ }
+ }
+ }
+
+ impl AsyncWrite for DelayStream {
+ fn poll_write(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ buf: &[u8],
+ ) -> Poll<Result<usize, io::Error>> {
+ match self.project().sleep.poll(cx) {
+ Poll::Ready(()) => Poll::Ready(Ok(buf.len())),
+ Poll::Pending => Poll::Pending,
+ }
+ }
+
+ fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ Poll::Ready(Ok(()))
+ }
+
+ fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context) -> Poll<Result<(), io::Error>> {
+ Poll::Ready(Ok(()))
+ }
+ }
+
+ #[tokio::test]
+ async fn read_timeout() {
+ let reader = DelayStream::new(Instant::now() + Duration::from_millis(500));
+ let mut reader = TimeoutReader::new(reader);
+ reader.set_timeout(Some(Duration::from_millis(100)));
+ pin!(reader);
+
+ let r = reader.read(&mut [0]).await;
+ assert_eq!(r.err().unwrap().kind(), io::ErrorKind::TimedOut);
+ }
+
+ #[tokio::test]
+ async fn read_ok() {
+ let reader = DelayStream::new(Instant::now() + Duration::from_millis(100));
+ let mut reader = TimeoutReader::new(reader);
+ reader.set_timeout(Some(Duration::from_millis(500)));
+ pin!(reader);
+
+ reader.read(&mut [0]).await.unwrap();
+ }
+
+ #[tokio::test]
+ async fn write_timeout() {
+ let writer = DelayStream::new(Instant::now() + Duration::from_millis(500));
+ let mut writer = TimeoutWriter::new(writer);
+ writer.set_timeout(Some(Duration::from_millis(100)));
+ pin!(writer);
+
+ let r = writer.write(&[0]).await;
+ assert_eq!(r.err().unwrap().kind(), io::ErrorKind::TimedOut);
+ }
+
+ #[tokio::test]
+ async fn write_ok() {
+ let writer = DelayStream::new(Instant::now() + Duration::from_millis(100));
+ let mut writer = TimeoutWriter::new(writer);
+ writer.set_timeout(Some(Duration::from_millis(500)));
+ pin!(writer);
+
+ writer.write(&[0]).await.unwrap();
+ }
+
+ #[tokio::test]
+ async fn tcp_read() {
+ let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+ let addr = listener.local_addr().unwrap();
+
+ thread::spawn(move || {
+ let mut socket = listener.accept().unwrap().0;
+ thread::sleep(Duration::from_millis(10));
+ socket.write_all(b"f").unwrap();
+ thread::sleep(Duration::from_millis(500));
+ let _ = socket.write_all(b"f"); // this may hit an eof
+ });
+
+ let s = TcpStream::connect(&addr).await.unwrap();
+ let mut s = TimeoutStream::new(s);
+ s.set_read_timeout(Some(Duration::from_millis(100)));
+ pin!(s);
+ s.read(&mut [0]).await.unwrap();
+ let r = s.read(&mut [0]).await;
+
+ match r {
+ Ok(_) => panic!("unexpected success"),
+ Err(ref e) if e.kind() == io::ErrorKind::TimedOut => (),
+ Err(e) => panic!("{:?}", e),
+ }
+ }
+}
