Initial commit for option-ext 0.2.0
Change-Id: I6bee9b9dd96fa9e5803472632eaa0f49911ce9ae
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d413552
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*/target/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c4404bb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+This repository contains mirrored source of the
+[`option-ext`](https://crates.io/crates/option-ext) crate from crates.io.
+
+To update to a new version, use [`cargo download`](https://crates.io/crates/cargo-download).
+
+```sh
+cargo download option-ext==<VERSION> | tar zxf -
+```
+
+Modifications from the upstream source:
+* None
diff --git a/option-ext-0.2.0/.cargo_vcs_info.json b/option-ext-0.2.0/.cargo_vcs_info.json
new file mode 100644
index 0000000..d3a4cd4
--- /dev/null
+++ b/option-ext-0.2.0/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+ "git": {
+ "sha1": "272f22fc9ea1ac6b08f01704af52c4ac338df4e2"
+ },
+ "path_in_vcs": ""
+}
\ No newline at end of file
diff --git a/option-ext-0.2.0/.gitignore b/option-ext-0.2.0/.gitignore
new file mode 100644
index 0000000..010758b
--- /dev/null
+++ b/option-ext-0.2.0/.gitignore
@@ -0,0 +1,4 @@
+Cargo.lock
+/target
+**/*.rs.bk
+.idea
diff --git a/option-ext-0.2.0/Cargo.toml b/option-ext-0.2.0/Cargo.toml
new file mode 100644
index 0000000..f0726df
--- /dev/null
+++ b/option-ext-0.2.0/Cargo.toml
@@ -0,0 +1,22 @@
+# 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]
+name = "option-ext"
+version = "0.2.0"
+authors = ["Simon Ochsenreither <simon@ochsenreither.de>"]
+description = "Extends `Option` with additional operations"
+homepage = "https://github.com/soc/option-ext"
+documentation = "https://docs.rs/option-ext/"
+readme = "README.md"
+categories = ["rust-patterns", "algorithms"]
+license = "MPL-2.0"
+repository = "https://github.com/soc/option-ext.git"
diff --git a/option-ext-0.2.0/Cargo.toml.orig b/option-ext-0.2.0/Cargo.toml.orig
new file mode 100644
index 0000000..4f648c6
--- /dev/null
+++ b/option-ext-0.2.0/Cargo.toml.orig
@@ -0,0 +1,11 @@
+[package]
+name = "option-ext"
+description = "Extends `Option` with additional operations"
+version = "0.2.0"
+authors = ["Simon Ochsenreither <simon@ochsenreither.de>"]
+categories = ["rust-patterns", "algorithms"]
+documentation = "https://docs.rs/option-ext/"
+repository = "https://github.com/soc/option-ext.git"
+homepage = "https://github.com/soc/option-ext"
+readme = "README.md"
+license = "MPL-2.0"
diff --git a/option-ext-0.2.0/LICENSE.txt b/option-ext-0.2.0/LICENSE.txt
new file mode 100644
index 0000000..ee6256c
--- /dev/null
+++ b/option-ext-0.2.0/LICENSE.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/option-ext-0.2.0/README.md b/option-ext-0.2.0/README.md
new file mode 100644
index 0000000..998a978
--- /dev/null
+++ b/option-ext-0.2.0/README.md
@@ -0,0 +1,67 @@
+[](https://crates.io/crates/option-ext)
+[](https://docs.rs/option-ext/)
+
+
+
+# `option-ext`
+
+## Introduction
+
+This crate extends `Option` with additional methods, currently:
+
+- `contains`
+- `map_or2` (as a replacement for `map_or`)
+- `map_or_else2` (as a replacement for `map_or_else`)
+
+Its sister crate is [`result-ext`](https://github.com/soc/result-ext), which extends `Result`.
+
+## Requirements
+
+Rust 1.0 or newer.
+
+## Usage
+
+#### Dependency
+
+Add the library as a dependency to your project by inserting
+
+```toml
+option-ext = "0.2.0"
+```
+
+into the `[dependencies]` section of your Cargo.toml file.
+
+#### Example
+
+```rust
+use option_ext::OptionExt;
+
+fn example_contains() {
+ let x: Option<u32> = Some(2);
+ assert_eq!(x.contains(&2), true);
+
+ let x: Option<u32> = Some(3);
+ assert_eq!(x.contains(&2), false);
+
+ let x: Option<u32> = None;
+ assert_eq!(x.contains(&2), false);
+}
+
+fn example_map_or2() {
+ let x = Some("bar");
+ assert_eq!(x.map_or2(|v| v.len(), 42), 3);
+
+ let x: Option<&str> = None;
+ assert_eq!(x.map_or2(|v| v.len(), 42), 42);
+}
+
+fn example_map_or_else2() {
+ let k = 23;
+
+ let x = Some("bar");
+ assert_eq!(x.map_or_else2(|v| v.len(), || 2 * k), 3);
+
+ let x: Option<&str> = None;
+ assert_eq!(x.map_or_else2(|v| v.len(), || 2 * k), 46);
+}
+```
diff --git a/option-ext-0.2.0/src/impl.rs b/option-ext-0.2.0/src/impl.rs
new file mode 100644
index 0000000..d232092
--- /dev/null
+++ b/option-ext-0.2.0/src/impl.rs
@@ -0,0 +1,20 @@
+use OptionExt;
+
+impl<T> OptionExt<T> for Option<T> {
+ fn contains<U>(&self, x: &U) -> bool where U: PartialEq<T> {
+ match *self {
+ Some(ref y) => x == y,
+ None => false,
+ }
+ }
+
+ #[inline]
+ fn map_or2<U, F: FnOnce(T) -> U>(self, f: F, default: U) -> U {
+ self.map_or(default, f)
+ }
+
+ #[inline]
+ fn map_or_else2<U, F: FnOnce(T) -> U, D: FnOnce() -> U>(self, f: F, default: D) -> U {
+ self.map_or_else(default, f)
+ }
+}
diff --git a/option-ext-0.2.0/src/lib.rs b/option-ext-0.2.0/src/lib.rs
new file mode 100644
index 0000000..b4e6e26
--- /dev/null
+++ b/option-ext-0.2.0/src/lib.rs
@@ -0,0 +1,71 @@
+mod r#impl;
+
+/// Extension trait providing additional methods for `Option`.
+pub trait OptionExt<T> {
+ /// Returns `true` if the option is a [`Some`] value containing the given value.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use option_ext::OptionExt;
+ ///
+ /// let x: Option<u32> = Some(2);
+ /// assert_eq!(x.contains(&2), true);
+ ///
+ /// let x: Option<u32> = Some(3);
+ /// assert_eq!(x.contains(&2), false);
+ ///
+ /// let x: Option<u32> = None;
+ /// assert_eq!(x.contains(&2), false);
+ /// ```
+ #[must_use]
+ fn contains<U>(&self, x: &U) -> bool where U: PartialEq<T>;
+
+ /// Returns the result from applying the function to the contained value if the option is [`Some`],
+ /// or returns provided default result if the option is [`None`].
+ ///
+ /// The `f` argument of `map_or2` is only evaluated if the option is [`Some`].
+ /// The default argument of `map_or2` is always evaluated – even if the option is [`Some`].
+ /// Use [`map_or_else2`] to avoid this.
+ ///
+ /// [`map_or_else2`]: OptionExt::map_or_else2
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use option_ext::OptionExt;
+ ///
+ /// let x = Some("bar");
+ /// assert_eq!(x.map_or2(|v| v.len(), 42), 3);
+ ///
+ /// let x: Option<&str> = None;
+ /// assert_eq!(x.map_or2(|v| v.len(), 42), 42);
+ /// ```
+ #[must_use]
+ fn map_or2<U, F: FnOnce(T) -> U>(self, f: F, default: U) -> U;
+
+ /// Returns the result from applying the function to the contained value if the option is [`Some`],
+ /// or returns the result from evaluating the provided default function if the option is [`None`].
+ ///
+ /// The `f` argument of `map_or_else2` is only evaluated if the option is [`Some`].
+ /// The default argument of `map_or_else2` is only evaluated if the option is [`None`].
+ /// Use [`map_or2`] to always evaluate the default argument.
+ ///
+ /// [`map_or2`]: OptionExt::map_or2
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use option_ext::OptionExt;
+ ///
+ /// let k = 23;
+ ///
+ /// let x = Some("bar");
+ /// assert_eq!(x.map_or_else2(|v| v.len(), || 2 * k), 3);
+ ///
+ /// let x: Option<&str> = None;
+ /// assert_eq!(x.map_or_else2(|v| v.len(), || 2 * k), 46);
+ /// ```
+ #[must_use]
+ fn map_or_else2<U, F: FnOnce(T) -> U, D: FnOnce() -> U>(self, f: F, default: D) -> U;
+}
