user-classes: Remove pre-customize-hook---premature optimization.

atlas-engineer · Dec 6, 2023 · 09a5e73 · 09a5e73
1 parent 123d408
commit 09a5e73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/source/configuration-commands.lisp b/source/configuration-commands.lisp
@@ -83,8 +83,7 @@ On error, return the condition as a first value and the backtrace as second valu
 (define-command clean-configuration ()
   "Clean all the user configuration created with `define-configuration' or `customize-instance'."
   (dolist (class (sera:filter #'user-class-p (sym:package-classes* (nyxt-packages))))
-    (setf (hooks:handlers-alist (slot-value class 'customize-hook)) nil)
-    (setf (hooks:handlers-alist (slot-value class 'pre-customize-hook)) nil))
+    (setf (hooks:handlers-alist (slot-value class 'customize-hook)) nil))
   (dolist (method (mopu:generic-function-methods #'customize-instance))
     (unless (or (equal (list (find-class t)) ; Don't remove default method.
                        (mopu:method-specializers method))

diff --git a/source/configuration.lisp b/source/configuration.lisp
@@ -350,9 +350,7 @@ To discover the default value of a slot or all slots of a class, use the
                         when slot
                           collect
                         `(let ((,hook (slot-value (find-class (quote ,class))
-                                                  (quote ,(if nyxt-internal-config-p
-                                                             'nyxt::pre-customize-hook
-                                                             'nyxt::customize-hook))))
+                                                  'nyxt::customize-hook))
                                (,handler (make-instance
                                           'hooks:handler
                                           :fn (lambda (object)

diff --git a/source/user-classes.lisp b/source/user-classes.lisp
@@ -10,10 +10,7 @@
 
 Reserved for `define-configuration'.
 
-Prefer `define-configuration' and `customize-instance' instead.")
-   (pre-customize-hook :initform (make-instance 'hooks:hook-any)
-                       :accessor pre-customize-hook
-                       :documentation "Internal hook reserved for Nyxt core `%define-configuration'."))
+Prefer `define-configuration' and `customize-instance' instead."))
   (:documentation "Classes using this metaclass will call `customize-instance'
 on instantiation.
 This is useful to expose a class configuration knob to the user.
@@ -71,7 +68,6 @@ Do not specialize the standard method in public code, prefer
   :around ((class user-mixin-class) &rest initargs &key &allow-other-keys)
   (sera:lret ((initialized-object (call-next-method)))
     (mapcar (lambda (class)
-              (hooks:run-hook (slot-value class 'pre-customize-hook) initialized-object)
               (hooks:run-hook (slot-value class 'customize-hook) initialized-object))
             (sera:filter #'user-class-p (cons class (mopu:superclasses class))))
     (apply #'customize-instance initialized-object initargs)))