diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-27 11:44:19 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-27 22:07:03 +0530 |
| commit | ce5f1b3216be790be590ad71eabccc16c9b86c74 (patch) | |
| tree | 4c9dfe88dc24c2d581e60905ef2f3aa7ae7c9315 /src/rustllvm/ExecutionEngineWrapper.cpp | |
| parent | ef80ade4069aede2e7c08b04556177ce7ea9ae3d (diff) | |
| parent | 07dc8d67c92017f950eef3951ec901cb2a3add7e (diff) | |
| download | rust-ce5f1b3216be790be590ad71eabccc16c9b86c74.tar.gz rust-ce5f1b3216be790be590ad71eabccc16c9b86c74.zip | |
Rollup merge of #22817 - jmesmon:result-or-type, r=huonw
Changes .or() so that it can return a Result with a different E type
than the one it is called on.
Essentially:
fn or(self, res: Result<T, E>) -> Result<T, E>
becomes
fn or<F>(self, res: Result<T, F>) -> Result<T, F>
This brings `or` in line with the existing `and` & `or_else`
This is a
[breaking-change]
Due to some code needing additional type annotations.
Diffstat (limited to 'src/rustllvm/ExecutionEngineWrapper.cpp')
0 files changed, 0 insertions, 0 deletions