refactor(wpcarro/emacs): Remove cycle.el's dep on maybe.el r/4379

More pruning on inter-library dependencies.

Change-Id: I711ab92f2985b543ee2684752f9cdbf5559f2eaf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6035
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI

3 files changed, 6 insertions, 14 deletions

diff --git a/users/wpcarro/emacs/pkgs/cycle/cycle.el b/users/wpcarro/emacs/pkgs/cycle/cycle.el
index 17dbd2fdb906..2f5b252a0d6a 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
diff --git a/users/wpcarro/emacs/pkgs/cycle/default.nix b/users/wpcarro/emacs/pkgs/cycle/default.nix
index 16c887bbfc8f..7ef3b431ada6 100644
--- a/users/wpcarro/emacs/pkgs/cycle/default.nix
+++ b/users/wpcarro/emacs/pkgs/cycle/default.nix
@@ -12,7 +12,6 @@ let
             dash
           ]) ++
           (with depot.users.wpcarro.emacs.pkgs; [
-            maybe
             struct
           ]);
       })
@@ -20,7 +19,6 @@ let
 
   emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
     epkgs.dash
-    depot.users.wpcarro.emacs.pkgs.maybe
     cycle
   ]);
 in
diff --git a/users/wpcarro/emacs/pkgs/cycle/tests.el b/users/wpcarro/emacs/pkgs/cycle/tests.el
index e58c97bedbe2..29c0e2a0d582 100644
--- a/users/wpcarro/emacs/pkgs/cycle/tests.el
+++ b/users/wpcarro/emacs/pkgs/cycle/tests.el
@@ -5,7 +5,6 @@
 (require 'ert)
 (require 'cycle)
 (require 'dash)
-(require 'maybe)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Tests
@@ -15,7 +14,7 @@
 
 (ert-deftest cycle-initializes-properly ()
   (should (= 3 (cycle-count xs)))
-  (should (maybe-nil? (cycle-previous-focus xs)))
+  (should (null (cycle-previous-focus xs)))
   (should (cycle-contains? 1 xs))
   (should (cycle-contains? 2 xs))
   (should (cycle-contains? 3 xs)))