From 0068501aa086efc1b01620ec5bd427ef57cb9f9d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 7 Dec 2017 22:40:48 -0800
Subject: [PATCH] Remove several unnecessary calls to `ignore'

---
 lisp/use-package/use-package-bind-key.el   |  29 ++--
 lisp/use-package/use-package-chords.el     |   5 +-
 lisp/use-package/use-package-core.el       |  62 ++++-----
 lisp/use-package/use-package-ensure.el     |   9 +-
 test/lisp/use-package/use-package-tests.el | 152 ++++++++-------------
 5 files changed, 108 insertions(+), 149 deletions(-)

diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 6a8e3fbe8eb..b26c812bf58 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -128,9 +128,8 @@ deferred until the prefix key sequence is pressed."
     (name keyword args rest state &optional bind-macro)
   (use-package-concat
    (use-package-process-keywords name rest state)
-   `((ignore
-      (,(if bind-macro bind-macro 'bind-keys)
-       :package ,name ,@(use-package-normalize-commands args))))))
+   `((,(if bind-macro bind-macro 'bind-keys)
+      :package ,name ,@(use-package-normalize-commands args)))))
 
 (defun use-package-handler/:bind* (name keyword arg rest state)
   (use-package-handler/:bind name keyword arg rest state 'bind-keys*))
@@ -144,21 +143,19 @@ deferred until the prefix key sequence is pressed."
 
 ;;;###autoload
 (defun use-package-handler/:bind-keymap
-    (name keyword arg rest state &optional override)
+    (name keyword args rest state &optional override)
   (use-package-concat
    (use-package-process-keywords name rest state)
-   `((ignore
-      ,@(mapcar
-         #'(lambda (binding)
-             `(,(if override
-                    'bind-key*
-                  'bind-key)
-               ,(car binding)
-               #'(lambda ()
-                   (interactive)
-                   (use-package-autoload-keymap
-                    ',(cdr binding) ',(use-package-as-symbol name)
-                    ,override)))) arg)))))
+   (mapcar
+    #'(lambda (binding)
+        `(,(if override 'bind-key* 'bind-key)
+          ,(car binding)
+          #'(lambda ()
+              (interactive)
+              (use-package-autoload-keymap
+               ',(cdr binding) ',(use-package-as-symbol name)
+               ,override))))
+    args)))
 
 ;;;###autoload
 (defun use-package-handler/:bind-keymap* (name keyword arg rest state)
diff --git a/lisp/use-package/use-package-chords.el b/lisp/use-package/use-package-chords.el
index 8cdd30990cb..63a9737109f 100644
--- a/lisp/use-package/use-package-chords.el
+++ b/lisp/use-package/use-package-chords.el
@@ -39,9 +39,8 @@
              (use-package-sort-keywords
               (use-package-plist-maybe-put rest :defer t))
              (use-package-plist-append state :commands commands))
-           `((ignore
-              ,(macroexpand
-                `(bind-chords :package ,name ,@arg)))))))
+           `(,(macroexpand
+               `(bind-chords :package ,name ,@arg))))))
     (use-package-handler/:preface name keyword chord-binder rest state)))
 
 (add-to-list 'use-package-keywords :chords t)
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 001ffde1534..9e32fb477d3 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -414,10 +414,9 @@ The BODY is a list of forms, so `((foo))' if only `foo' is being called."
       (use-package-with-elapsed-timer
           (format "Loading package %s" name)
         `((if (not ,(use-package-load-name name t))
-              (ignore
-               (display-warning 'use-package
-                                (format "Cannot load %s" ',name)
-                                :error))
+              (display-warning 'use-package
+                               (format "Cannot load %s" ',name)
+                               :error)
             ,@body))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -906,14 +905,13 @@ If RECURSED is non-nil, recurse into sublists."
   "Handle keywords which add regexp/mode pairs to an alist."
   (use-package-concat
    (use-package-process-keywords name rest state)
-   `((ignore
-      ,@(mapcar
-         #'(lambda (thing)
-             `(add-to-list
-               ',alist
-               ',(cons (use-package-normalize-regex (car thing))
-                       (cdr thing))))
-         (use-package-normalize-commands args))))))
+   (mapcar
+    #'(lambda (thing)
+        `(add-to-list
+          ',alist
+          ',(cons (use-package-normalize-regex (car thing))
+                  (cdr thing))))
+    (use-package-normalize-commands args))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -1101,7 +1099,7 @@ meaning:
                       (setq msg
                             (concat msg
                                     " (see the *use-package* buffer)"))))
-                (ignore (display-warning 'use-package msg :error)))))
+                (display-warning 'use-package msg :error))))
         ,@(let ((use-package--hush-function
                  (apply-partially #'use-package-hush context)))
             (funcall use-package--hush-function keyword
@@ -1175,21 +1173,20 @@ meaning:
   "Generate use-package custom keyword code."
   (use-package-concat
    (use-package-process-keywords name rest state)
-   `((ignore
-      ,@(cl-mapcan
-         #'(lambda (def)
-             (let ((syms (car def))
-                   (fun (cdr def)))
-               (when fun
-                 (mapcar
-                  #'(lambda (sym)
-                      `(add-hook
-                        (quote ,(intern
-                                 (concat (symbol-name sym)
-                                         use-package-hook-name-suffix)))
-                        (function ,fun)))
-                  (if (use-package-non-nil-symbolp syms) (list syms) syms)))))
-         (use-package-normalize-commands args))))))
+   (cl-mapcan
+    #'(lambda (def)
+        (let ((syms (car def))
+              (fun (cdr def)))
+          (when fun
+            (mapcar
+             #'(lambda (sym)
+                 `(add-hook
+                   (quote ,(intern
+                            (concat (symbol-name sym)
+                                    use-package-hook-name-suffix)))
+                   (function ,fun)))
+             (if (use-package-non-nil-symbolp syms) (list syms) syms)))))
+    (use-package-normalize-commands args))))
 
 ;;;; :commands
 
@@ -1494,11 +1491,10 @@ this file.  Usage:
         (condition-case-unless-debug err
             (use-package-core name args)
           (error
-           (ignore
-            (display-warning
-             'use-package
-             (format "Failed to parse package %s: %s"
-                     name (error-message-string err)) :error)))))
+           (display-warning
+            'use-package
+            (format "Failed to parse package %s: %s"
+                    name (error-message-string err)) :error))))
       (when use-package-compute-statistics
         `((use-package-statistics-gather :use-package ',name t)))))))
 
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 3ae8201dc24..1a76b883e1c 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -177,11 +177,10 @@ manually updated package."
                   (package-install package))
                 t)
             (error
-             (ignore
-              (display-warning 'use-package
-                               (format "Failed to install %s: %s"
-                                       name (error-message-string err))
-                               :error)))))))))
+             (display-warning 'use-package
+                              (format "Failed to install %s: %s"
+                                      name (error-message-string err))
+                              :error))))))))
 
 ;;;###autoload
 (defun use-package-handler/:ensure (name keyword ensure rest state)
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 0b40fb582ad..5ba6db8a4b5 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -594,10 +594,9 @@
       (unless
           (fboundp 'key2)
         (autoload #'key2 "foo" nil t))
-      (ignore
-       (bind-keys :package foo
-                  ("C-k" . key1)
-                  ("C-u" . key2))))))
+      (bind-keys :package foo
+                 ("C-k" . key1)
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-2 ()
   (match-expansion
@@ -607,10 +606,9 @@
         (autoload #'key1 "foo" nil t))
       (unless (fboundp 'key2)
         (autoload #'key2 "foo" nil t))
-      (ignore
-       (bind-keys :package foo
-                  ("C-k" . key1)
-                  ("C-u" . key2))))))
+      (bind-keys :package foo
+                 ("C-k" . key1)
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-3 ()
   (match-expansion
@@ -622,17 +620,15 @@
       (unless
           (fboundp 'key2)
         (autoload #'key2 "foo" nil t))
-      (ignore
-       (bind-keys :package foo :map my-map
-                  ("C-k" . key1)
-                  ("C-u" . key2))))))
+      (bind-keys :package foo :map my-map
+                 ("C-k" . key1)
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-4 ()
   (should-error
    (match-expansion
     (use-package foo :bind :map my-map ("C-k" . key1) ("C-u" . key2))
-    `(ignore
-      (bind-keys :package foo)))))
+    `(bind-keys :package foo))))
 
 (ert-deftest use-package-test/:bind-5 ()
   (match-expansion
@@ -642,11 +638,10 @@
         (autoload #'key1 "foo" nil t))
       (unless (fboundp 'key2)
         (autoload #'key2 "foo" nil t))
-      (ignore
-       (bind-keys :package foo
-                  ("C-k" . key1)
-                  :map my-map
-                  ("C-u" . key2))))))
+      (bind-keys :package foo
+                 ("C-k" . key1)
+                 :map my-map
+                 ("C-u" . key2)))))
 
 (ert-deftest use-package-test/:bind-6 ()
   (match-expansion
@@ -662,11 +657,10 @@
         (autoload #'key2 "foo" nil t))
       (unless (fboundp 'key3)
         (autoload #'key3 "foo" nil t))
-      (ignore
-       (bind-keys :package foo
-                  ("C-k" . key1)
-                  :map my-map ("C-u" . key2)
-                  :map my-map2 ("C-u" . key3))))))
+      (bind-keys :package foo
+                 ("C-k" . key1)
+                 :map my-map ("C-u" . key2)
+                 :map my-map2 ("C-u" . key3)))))
 
 (ert-deftest use-package-test/:bind-7 ()
   (match-expansion
@@ -677,8 +671,7 @@
       (use-package-ensure-elpa 'foo '(t) 'nil)
       (unless (fboundp 'browse-at-remote)
         (autoload #'browse-at-remote "foo" nil t))
-      (ignore
-       (bind-keys :package foo ("C-c r" . browse-at-remote))))))
+      (bind-keys :package foo ("C-c r" . browse-at-remote)))))
 
 (ert-deftest use-package-test/:bind-8 ()
   (match-expansion
@@ -693,10 +686,9 @@
         (autoload #'foo "foo" nil t))
       (unless (fboundp 'bar)
         (autoload #'bar "foo" nil t))
-      (ignore
-       (bind-keys :package foo :map foo-map
-                  ("C-c r" . foo)
-                  ("C-c r" . bar))))))
+      (bind-keys :package foo :map foo-map
+                 ("C-c r" . foo)
+                 ("C-c r" . bar)))))
 
 (ert-deftest use-package-test/:bind*-1 ()
   (match-expansion
@@ -704,26 +696,23 @@
    `(progn
       (unless (fboundp 'key)
         (autoload #'key "foo" nil t))
-      (ignore
-       (bind-keys* :package foo ("C-k" . key))))))
+      (bind-keys* :package foo ("C-k" . key)))))
 
 (ert-deftest use-package-test/:bind-keymap-1 ()
   (match-expansion
    (use-package foo :bind-keymap ("C-k" . key))
-   `(ignore
-     (bind-key "C-k"
-               #'(lambda nil
-                   (interactive)
-                   (use-package-autoload-keymap 'key 'foo nil))))))
+   `(bind-key "C-k"
+              #'(lambda nil
+                  (interactive)
+                  (use-package-autoload-keymap 'key 'foo nil)))))
 
 (ert-deftest use-package-test/:bind-keymap*-1 ()
   (match-expansion
    (use-package foo :bind-keymap* ("C-k" . key))
-   `(ignore
-     (bind-key* "C-k"
-                #'(lambda ()
-                    (interactive)
-                    (use-package-autoload-keymap 'key 'foo t))))))
+   `(bind-key* "C-k"
+               #'(lambda ()
+                   (interactive)
+                   (use-package-autoload-keymap 'key 'foo t)))))
 
 (ert-deftest use-package-test/:interpreter-1 ()
   (match-expansion
@@ -731,8 +720,7 @@
    `(progn
       (unless (fboundp 'foo)
         (autoload #'foo "foo" nil t))
-      (ignore
-       (add-to-list 'interpreter-mode-alist '("interp" . foo))))))
+      (add-to-list 'interpreter-mode-alist '("interp" . foo)))))
 
 (ert-deftest use-package-test/:interpreter-2 ()
   (match-expansion
@@ -740,8 +728,7 @@
    `(progn
       (unless (fboundp 'fun)
         (autoload #'fun "foo" nil t))
-      (ignore
-       (add-to-list 'interpreter-mode-alist '("interp" . fun))))))
+      (add-to-list 'interpreter-mode-alist '("interp" . fun)))))
 
 (ert-deftest use-package-test-normalize/:mode ()
   (flet ((norm (&rest args)
@@ -764,8 +751,7 @@
    `(progn
       (unless (fboundp 'foo)
         (autoload #'foo "foo" nil t))
-      (ignore
-       (add-to-list 'auto-mode-alist '("interp" . foo))))))
+      (add-to-list 'auto-mode-alist '("interp" . foo)))))
 
 (ert-deftest use-package-test/:mode-2 ()
   (match-expansion
@@ -773,8 +759,7 @@
    `(progn
       (unless (fboundp 'fun)
         (autoload #'fun "foo" nil t))
-      (ignore
-       (add-to-list 'auto-mode-alist '("interp" . fun))))))
+      (add-to-list 'auto-mode-alist '("interp" . fun)))))
 
 (ert-deftest use-package-test/:magic-1 ()
   (match-expansion
@@ -782,8 +767,7 @@
    `(progn
       (unless (fboundp 'foo)
         (autoload #'foo "foo" nil t))
-      (ignore
-       (add-to-list 'magic-mode-alist '("interp" . foo))))))
+      (add-to-list 'magic-mode-alist '("interp" . foo)))))
 
 (ert-deftest use-package-test/:magic-2 ()
   (match-expansion
@@ -791,8 +775,7 @@
    `(progn
       (unless (fboundp 'fun)
         (autoload #'fun "foo" nil t))
-      (ignore
-       (add-to-list 'magic-mode-alist '("interp" . fun))))))
+      (add-to-list 'magic-mode-alist '("interp" . fun)))))
 
 (ert-deftest use-package-test/:magic-fallback-1 ()
   (match-expansion
@@ -800,8 +783,7 @@
    `(progn
       (unless (fboundp 'foo)
         (autoload #'foo "foo" nil t))
-      (ignore
-       (add-to-list 'magic-fallback-mode-alist '("interp" . foo))))))
+      (add-to-list 'magic-fallback-mode-alist '("interp" . foo)))))
 
 (ert-deftest use-package-test/:magic-fallback-2 ()
   (match-expansion
@@ -809,8 +791,7 @@
    `(progn
       (unless (fboundp 'fun)
         (autoload #'fun "foo" nil t))
-      (ignore
-       (add-to-list 'magic-fallback-mode-alist '("interp" . fun))))))
+      (add-to-list 'magic-fallback-mode-alist '("interp" . fun)))))
 
 (ert-deftest use-package-test/:commands-1 ()
   (match-expansion
@@ -1039,10 +1020,8 @@
           (autoload #'fun "foo" nil t))
         (eval-when-compile
           (declare-function fun "foo"))
-        (ignore
-         (add-hook 'hook-hook #'fun))
-        (ignore
-         (bind-keys :package foo ("C-a" . key)))))))
+        (add-hook 'hook-hook #'fun)
+        (bind-keys :package foo ("C-a" . key))))))
 
 (ert-deftest use-package-test/:hook-2 ()
   (match-expansion
@@ -1051,8 +1030,7 @@
    `(progn
       (unless (fboundp 'fun)
         (autoload #'fun "foo" nil t))
-      (ignore
-       (add-hook 'hook-hook #'fun)))))
+      (add-hook 'hook-hook #'fun))))
 
 (ert-deftest use-package-test/:hook-3 ()
   (let ((use-package-hook-name-suffix nil))
@@ -1062,8 +1040,7 @@
      `(progn
         (unless (fboundp 'fun)
           (autoload #'fun "foo" nil t))
-        (ignore
-         (add-hook 'hook #'fun))))))
+        (add-hook 'hook #'fun)))))
 
 (ert-deftest use-package-test/:hook-4 ()
   (let ((use-package-hook-name-suffix "-special"))
@@ -1073,8 +1050,7 @@
      `(progn
         (unless (fboundp 'fun)
           (autoload #'fun "foo" nil t))
-        (ignore
-         (add-hook 'hook-special #'fun))))))
+        (add-hook 'hook-special #'fun)))))
 
 (ert-deftest use-package-test/:hook-5 ()
   (match-expansion
@@ -1091,11 +1067,10 @@
       (eval-after-load 'elisp-mode
         '(progn
            (require 'erefactor nil nil)
-           (ignore
-            (add-hook
-             'emacs-lisp-mode-hook
-             #'(lambda nil
-                 (bind-key "" erefactor-map emacs-lisp-mode-map)))))))))
+           (add-hook
+            'emacs-lisp-mode-hook
+            #'(lambda nil
+                (bind-key "" erefactor-map emacs-lisp-mode-map))))))))
 
 (ert-deftest use-package-test/:hook-6 ()
   (match-expansion
@@ -1110,8 +1085,7 @@
         '(progn
            (unless (fboundp 'function)
              (autoload #'function "erefactor" nil t))
-           (ignore
-            (add-hook 'emacs-lisp-mode-hook #'function)))))))
+           (add-hook 'emacs-lisp-mode-hook #'function))))))
 
 (ert-deftest use-package-test/:hook-7 ()
   (match-expansion
@@ -1125,8 +1099,7 @@
       (eval-after-load 'elisp-mode
         '(progn
            (require 'erefactor nil nil)
-           (ignore
-            (add-hook 'emacs-lisp-mode-hook #'(lambda nil (function)))))))))
+           (add-hook 'emacs-lisp-mode-hook #'(lambda nil (function))))))))
 
 (ert-deftest use-package-test-normalize/:custom ()
   (flet ((norm (&rest args)
@@ -1182,8 +1155,7 @@
         #'(lambda (keyword err)
             (let ((msg (format "%s/%s: %s" 'foo keyword
                                (error-message-string err))))
-              (ignore
-               (display-warning 'use-package msg :error)))))
+              (display-warning 'use-package msg :error))))
       (condition-case-unless-debug err
           (require 'foo nil nil)
         (error
@@ -1433,10 +1405,9 @@
            (require 'counsel nil nil)
            (if (fboundp 'diminish)
                (diminish 'counsel-mode))
-           (ignore
-            (bind-keys :package counsel
-                       ("C-*" . counsel-org-agenda-headlines)
-                       ("M-x" . counsel-M-x))))))))
+           (bind-keys :package counsel
+                      ("C-*" . counsel-org-agenda-headlines)
+                      ("M-x" . counsel-M-x)))))))
 
 (ert-deftest use-package-test/:config-1 ()
   (match-expansion
@@ -1680,8 +1651,7 @@
         (autoload #'mu4e "mu4e" nil t))
       (eval-after-load 'mu4e
         '(progn (config) t))
-      (ignore
-       (bind-keys :package mu4e ("<f9>" . mu4e))))))
+      (bind-keys :package mu4e ("<f9>" . mu4e)))))
 
 (ert-deftest use-package-test/543 ()
   (match-expansion
@@ -1719,11 +1689,10 @@
       (unless
           (fboundp 'company-try-hard)
         (autoload #'company-try-hard "company-try-hard" nil t))
-      (ignore
-       (bind-keys :package company-try-hard
-                  ("C-c M-/" . company-try-hard)
-                  :map company-active-map
-                  ("C-c M-/" . company-try-hard))))))
+      (bind-keys :package company-try-hard
+                 ("C-c M-/" . company-try-hard)
+                 :map company-active-map
+                 ("C-c M-/" . company-try-hard)))))
 
 (ert-deftest use-package-test/558 ()
   (match-expansion
@@ -1798,8 +1767,7 @@
         '(progn
            (message "test. helm start")
            t))
-      (ignore
-       (bind-keys :package helm ("C-c d" . helm-mini))))))
+      (bind-keys :package helm ("C-c d" . helm-mini)))))
 
 (ert-deftest bind-key/:prefix-map ()
   (match-expansion
-- 
2.39.2