diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-01-14 17:42:52 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-01-14 17:42:52 +0100 |
| commit | ea9d594d196e2e24977f454f1fd5b07dddbf7f87 (patch) | |
| tree | 76e218ca25a5d24d591ae2cc3e9aabbf03f1603d /src | |
| parent | 6dfcadbf240882082361e9c260a07299999bc855 (diff) | |
| download | chawan-ea9d594d196e2e24977f454f1fd5b07dddbf7f87.tar.gz | |
opt: remove value.ok, value.err overloads, use lent
largely unused
lent idea from nim-results
Diffstat (limited to 'src')
| -rw-r--r-- | src/local/pager.nim | 2 | ||||
| -rw-r--r-- | src/types/opt.nim | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/local/pager.nim b/src/local/pager.nim index 397d9c71..743dc093 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -2123,7 +2123,7 @@ proc updateReadLineISearch(pager: Pager; linemode: LineMode) = pager.isearchpromise = pager.isearchpromise.then(proc(): EmptyPromise = case lineedit.state of lesCancel: - pager.iregex.err() + pager.iregex = Result[Regex, string].err("") pager.container.popCursorPos() pager.container.clearSearchHighlights() pager.container.redraw = true diff --git a/src/types/opt.nim b/src/types/opt.nim index acd59164..0aebfefd 100644 --- a/src/types/opt.nim +++ b/src/types/opt.nim @@ -30,7 +30,7 @@ type template ok*[E](t: type Err[E]): Err[E] = Err[E](has: true) -template ok*[T, E](t: type Result[T, E], x: T): Result[T, E] = +template ok*[T, E](t: type Result[T, E]; x: T): Result[T, E] = Result[T, E](val: x, has: true) template ok*[T](x: T): auto = @@ -39,13 +39,7 @@ template ok*[T](x: T): auto = template ok*(): auto = ok(typeof(result)) -template ok*[T, E](res: var Result[T, E], x: T) = - res = Result[T, E](has: true, val: x) - -template ok*[E](res: var Result[void, E]) = - res = Result[void, E](has: true) - -template err*[T, E](t: type Result[T, E], e: E): Result[T, E] = +template err*[T, E](t: type Result[T, E]; e: E): Result[T, E] = Result[T, E](has: false, ex: e) template err*[T](t: type Result[T, ref object]): auto = @@ -57,12 +51,6 @@ template err*[T](t: type Result[T, void]): Result[T, void] = template err*(): auto = err(typeof(result)) -template err*[T, E](res: var Result[T, E], e: E) = - res = Result[T, E](has: false, ex: e) - -template err*[T, E](res: var Result[T, E]) = - res = Result[T, E](has: false) - template err*[E](e: E): auto = err(typeof(result), e) @@ -80,14 +68,14 @@ template opt*[T, E: not void](r: Result[T, E]): Opt[T] = template isSome*(res: Result): bool = res.has template isNone*(res: Result): bool = not res.has -func get*[T, E](res: Result[T, E]): T {.inline.} = res.val +func get*[T, E](res: Result[T, E]): lent T {.inline.} = res.val func get*[T, E](res: var Result[T, E]): var T = res.val -func get*[T, E](res: Result[T, E], v: T): T = +func get*[T, E](res: Result[T, E]; v: T): T = if res.has: res.val else: v -func error*[T, E](res: Result[T, E]): E {.inline.} = res.ex +func error*[T, E](res: Result[T, E]): lent E {.inline.} = res.ex template valType*[T, E](res: type Result[T, E]): auto = T template errType*[T, E](res: type Result[T, E]): auto = E |