From db0cfd0616f7432516068f6cb680c0b7c25cde4b Mon Sep 17 00:00:00 2001 From: William Carroll Date: Tue, 2 Aug 2022 14:20:46 -0700 Subject: refactor(wpcarro/emacs): Remove cycle.el's dep on maybe.el More pruning on inter-library dependencies. Change-Id: I711ab92f2985b543ee2684752f9cdbf5559f2eaf Reviewed-on: https://cl.tvl.fyi/c/depot/+/6035 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/emacs/pkgs/cycle/cycle.el | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'users/wpcarro/emacs/pkgs/cycle/cycle.el') diff --git a/users/wpcarro/emacs/pkgs/cycle/cycle.el b/users/wpcarro/emacs/pkgs/cycle/cycle.el index 17dbd2fdb9..2f5b252a0d 100644 --- a/users/wpcarro/emacs/pkgs/cycle/cycle.el +++ b/users/wpcarro/emacs/pkgs/cycle/cycle.el @@ -15,7 +15,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (require 'dash) -(require 'maybe) (require 'struct) (require 'cl-lib) @@ -55,19 +54,15 @@ (defun cycle-previous-focus (cycle) "Return the previously focused entry in CYCLE." (let ((i (cycle-previous-index cycle))) - (if (maybe-some? i) - (nth i (cycle-xs cycle)) - nil))) + (when i (nth i (cycle-xs cycle))))) (defun cycle-focus-previous! (xs) "Jump to the item in XS that was most recently focused; return the cycle. This will error when previous-index is nil. This function mutates the underlying struct." (let ((i (cycle-previous-index xs))) - (if (maybe-some? i) - (progn - (cycle-jump! i xs) - (cycle-current xs)) + (if i + (progn (cycle-jump! i xs) (cycle-current xs)) (error "Cannot focus the previous element since cycle-previous-index is nil")))) (defun cycle-next! (xs) @@ -163,7 +158,7 @@ If X is the currently focused value, after it's deleted, current-index will be (defun cycle-contains? (x xs) "Return t if cycle, XS, has member X." - (maybe-some? (-contains? (cycle-xs xs) x))) + (not (null (-contains? (cycle-xs xs) x)))) (defun cycle-empty? (xs) "Return t if cycle XS has no elements." @@ -171,7 +166,7 @@ If X is the currently focused value, after it's deleted, current-index will be (defun cycle-focused? (xs) "Return t if cycle XS has a non-nil value for current-index." - (maybe-some? (cycle-current-index xs))) + (not (null (cycle-current-index xs)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Helper Functions -- cgit 1.4.1