[elpa] externals/scanner eee1a77 54/56: remove useless type checks

[Stefan Monnier]

branch: externals/scanner
commit eee1a77e2b3abc6f42cc568459a592a87137c05b
Author: Raffael Stocker <address@hidden>
Commit: Raffael Stocker <address@hidden>

    remove useless type checks
---
 scanner-test.el | 30 +++++-------------------------
 scanner.el      | 24 +++++-------------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/scanner-test.el b/scanner-test.el
index 6934ff4..fa2b128 100644
--- a/scanner-test.el
+++ b/scanner-test.el
@@ -186,9 +186,7 @@
     (should (eql 300 (progn (scanner-set-image-resolution 300)
                            (plist-get scanner-resolution :image))))
     (should (eql 600 (progn (scanner-set-image-resolution 300)
-                           (plist-get scanner-resolution :doc))))
-    (should-error (scanner-set-image-resolution nil)
-                 :type 'wrong-type-argument)))
+                           (plist-get scanner-resolution :doc))))))
 
 (ert-deftest scanner-test-set-document-resolution ()
   "Test the document resolution setter."
@@ -196,43 +194,25 @@
     (should (eql 600 (progn (scanner-set-document-resolution 300)
                            (plist-get scanner-resolution :image))))
     (should (eql 300 (progn (scanner-set-document-resolution 300)
-                           (plist-get scanner-resolution :doc))))
-    (should-error (scanner-set-document-resolution nil)
-                 :type 'wrong-type-argument)))
+                           (plist-get scanner-resolution :doc))))))
 
 (ert-deftest scanner-test-select-papersize ()
   "Test the papersize selection command."
   (let ((scanner-paper-sizes '(:a4 (210 297) :a5 (148 210)))
        (scanner-doc-papersize :a5))
-    (should (eq :a4 (scanner-select-papersize :a4)))
-    (should-error (scanner-select-papersize :wrdlbrmpft)
-                 :type 'args-out-of-range)
-    (ignore-errors
-      (should (eq :a5 (scanner-select-papersize :wrdlbrmpft))))))
+    (should (eq :a4 (scanner-select-papersize :a4)))))
 
 (ert-deftest scanner-test-select-languages ()
   "Test the language selection command."
   (let ((scanner-tesseract-languages '("eng")))
     (should (equal '("deu") (scanner-select-languages '("deu"))))
-    (should (equal '("deu" "eng") (scanner-select-languages '("deu" "eng"))))
-    (should-error (scanner-select-languages 42)
-                 :type 'wrong-type-argument)
-    (should-error (scanner-select-languages '("eng" 42))
-                 :type 'wrong-type-argument)
-    (ignore-errors
-      (should (equal '("eng") (scanner-select-languages 42))))))
+    (should (equal '("deu" "eng") (scanner-select-languages '("deu" "eng"))))))
 
 (ert-deftest scanner-test-select-outputs ()
   "Test the output selection command."
   (let ((scanner-tesseract-outputs '("pdf")))
     (should (equal '("txt") (scanner-select-outputs '("txt"))))
-    (should (equal '("pdf" "txt") (scanner-select-outputs '("pdf" "txt"))))
-    (should-error (scanner-select-outputs 42)
-                 :type 'wrong-type-argument)
-    (should-error (scanner-select-outputs '("pdf" 42))
-                 :type 'wrong-type-argument)
-    (ignore-errors
-      (should (equal '("pdf") (scanner-select-outputs 42))))))
+    (should (equal '("pdf" "txt") (scanner-select-outputs '("pdf" "txt"))))))
 
 (provide 'scanner-test)
 
diff --git a/scanner.el b/scanner.el
index 703b33e..c6a1f4f 100644
--- a/scanner.el
+++ b/scanner.el
@@ -137,11 +137,11 @@ The value must be one of the keys in the paper sizes 
list."
 ERROR-MSG is passed to ‘format’ with two string arguments: the
 widget's values and the elements of SET."
   (let ((values (widget-value widget)))
-     (unless (cl-subsetp values set :test #'string=)
-       (widget-put widget :error (format error-msg
-                                        (mapconcat #'identity values ", ")
-                                        (mapconcat #'identity set ", ")))
-       widget)))
+    (unless (cl-subsetp values set :test #'string=)
+      (widget-put widget :error (format error-msg
+                                       (mapconcat #'identity values ", ")
+                                       (mapconcat #'identity set ", ")))
+      widget)))
 
 (defun scanner--validate-languages (widget)
   "Validate the language selection in customization WIDGET."
@@ -403,8 +403,6 @@ MSG is a format string, with ARGS passed to ‘format’."
                                    scanner-paper-sizes))))
      (list (intern (concat ":"
                           (completing-read "Papersize: " choices nil t))))))
-  (unless (plist-member scanner-paper-sizes size)
-    (signal 'args-out-of-range `(,size)))
   (setq scanner-doc-papersize size))
 
 (defun scanner-select-languages (languages)
@@ -413,10 +411,6 @@ MSG is a format string, with ARGS passed to ‘format’."
    (let ((langs (cdr (process-lines scanner-tesseract-program
                                    "--list-langs"))))
      (list (completing-read-multiple "Languages: " langs nil t))))
-  (unless (consp languages)
-    (signal 'wrong-type-argument `(consp ,languages)))
-  (unless (cl-every #'stringp languages)
-    (signal 'wrong-type-argument `(stringp ,@languages)))
   (setq scanner-tesseract-languages languages))
 
 (defun scanner-select-outputs (outputs)
@@ -424,24 +418,16 @@ MSG is a format string, with ARGS passed to ‘format’."
   (interactive
    (let ((configs (directory-files scanner-tesseract-configdir nil "[^.]")))
      (list (completing-read-multiple "Outputs: " configs nil t))))
-  (unless (consp outputs)
-    (signal 'wrong-type-argument `(consp ,outputs)))
-  (unless (cl-every #'stringp outputs)
-    (signal 'wrong-type-argument `(stringp ,@outputs)))
   (setq scanner-tesseract-outputs outputs))
 
 (defun scanner-set-image-resolution (resolution)
   "Set the RESOLUTION for scanning images."
   (interactive "NImage scan resolution: ")
-  (unless (numberp resolution)
-    (signal 'wrong-type-argument `(numberp ,resolution)))
   (plist-put scanner-resolution :image resolution))
 
 (defun scanner-set-document-resolution (resolution)
   "Set the RESOLUTION for scanning documents."
   (interactive "NDocument scan resolution: ")
-  (unless (numberp resolution)
-    (signal 'wrong-type-argument `(numberp ,resolution)))
   (plist-put scanner-resolution :doc resolution))
 
 (defun scanner-select-device (device)