Use `rx' in Tramp where possible

* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.

* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/".  Use
`eval-when-compile'.

* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.

* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.

* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'.  Improve sanity check.

* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.

* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.

2 files changed, 159 insertions, 144 deletions

diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index f51037aabb4..964404b4bf7 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -40,7 +40,8 @@
       "Format for `ert-resource-directory'.")
     (defvar ert-resource-directory-trim-left-regexp ""
       "Regexp for `string-trim' (left) used by `ert-resource-directory'.")
-    (defvar ert-resource-directory-trim-right-regexp "\\(-tests?\\)?\\.el"
+    (defvar ert-resource-directory-trim-right-regexp
+      (rx (? "-test" (? "s")) ".el")
       "Regexp for `string-trim' (right) used by `ert-resource-directory'.")
 
     (defmacro ert-resource-directory ()
@@ -615,13 +616,13 @@ This checks also `file-name-as-directory', `file-name-directory',
 	    (insert-directory tramp-archive-test-archive nil)
 	    (goto-char (point-min))
 	    (should
-	     (looking-at-p (regexp-quote tramp-archive-test-archive))))
+	     (looking-at-p (rx (literal tramp-archive-test-archive)))))
 	  (with-temp-buffer
 	    (insert-directory tramp-archive-test-archive "-al")
 	    (goto-char (point-min))
 	    (should
 	     (looking-at-p
-	      (format "^.+ %s$" (regexp-quote tramp-archive-test-archive)))))
+	      (rx bol (+ nonl) " " (literal tramp-archive-test-archive) eol))))
 	  (with-temp-buffer
 	    (insert-directory
 	     (file-name-as-directory tramp-archive-test-archive)
@@ -629,15 +630,17 @@ This checks also `file-name-as-directory', `file-name-directory',
 	    (goto-char (point-min))
 	    (should
 	     (looking-at-p
-	      (concat
-	       ;; There might be a summary line.
-	       "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?"
-	       ;; We don't know in which order the files appear.
-	       (format
-		"\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}"
-		(regexp-opt (directory-files tramp-archive-test-archive))
-		(length (directory-files tramp-archive-test-archive)))))))
-
+	      (rx-to-string
+	       `(:
+		 ;; There might be a summary line.
+		 (? "total" (+ nonl) (+ digit) (? " ")
+		    (? (any "EGKMPTYZk")) (? "i") (? "B") "\n")
+		 ;; We don't know in which order the files appear.
+		 (= ,(length (directory-files tramp-archive-test-archive))
+		    (+ nonl) " "
+		    (regexp
+		     ,(regexp-opt (directory-files tramp-archive-test-archive)))
+		    (? " ->" (one-or-more nonl)) "\n"))))))
 	  ;; Check error case.
 	  (with-temp-buffer
 	    (should-error
@@ -727,7 +730,7 @@ This tests also `access-file', `file-readable-p' and `file-regular-p'."
 	  (setq attr (directory-files-and-attributes tmp-name 'full))
 	  (dolist (elt attr)
 	    (should (equal (file-attributes (car elt)) (cdr elt))))
-	  (setq attr (directory-files-and-attributes tmp-name nil "\\`b"))
+	  (setq attr (directory-files-and-attributes tmp-name nil (rx bos "b")))
 	  (should (equal (mapcar #'car attr) '("bar"))))
 
       ;; Cleanup.
@@ -914,11 +917,14 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
 	(dolist (file `("/mock::foo" ,(concat tramp-archive-test-archive "foo")))
           (should
            (string-match
-	    (format
-	     "tramp-archive loaded: %s[[:ascii:]]+tramp-archive loaded: %s"
-	     (tramp-archive-file-name-p default-directory)
-	     (or (tramp-archive-file-name-p default-directory)
-		 (and enabled (tramp-archive-file-name-p file))))
+	    (rx "tramp-archive loaded: "
+		(literal (symbol-name
+			  (tramp-archive-file-name-p default-directory)))
+		(+ ascii)
+		"tramp-archive loaded: "
+		(literal (symbol-name
+			  (or (tramp-archive-file-name-p default-directory)
+			     (and enabled (tramp-archive-file-name-p file))))))
 	    (shell-command-to-string
 	     (format
 	      "%s -batch -Q -L %s --eval %s --eval %s"
@@ -955,9 +961,9 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
     (dolist (tae '(t nil))
       (should
        (string-match
-	(format
-	 "tramp-archive loaded: nil[[:ascii:]]+tramp-archive loaded: nil[[:ascii:]]+tramp-archive loaded: %s"
-	 tae)
+	(rx "tramp-archive loaded: nil" (+ ascii)
+	    "tramp-archive loaded: nil" (+ ascii)
+	    "tramp-archive loaded: " (literal (symbol-name tae)))
         (shell-command-to-string
          (format
 	  "%s -batch -Q -L %s --eval %s"
@@ -1005,7 +1011,8 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
 	     (apply
 	      'append
 	      (mapcar
-	       (lambda (x) (directory-files (concat dir x) 'full "uu\\'" 'sort))
+	       (lambda (x)
+		 (directory-files (concat dir x) 'full (rx "uu" eos) 'sort))
 	       '("~/src/libarchive-3.2.2/libarchive/test"
 		 "~/src/libarchive-3.2.2/cpio/test"
 		 "~/src/libarchive-3.2.2/tar/test"))))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 3e318a729d1..bc67ff2ace7 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -91,7 +91,8 @@
       "Format for `ert-resource-directory'.")
     (defvar ert-resource-directory-trim-left-regexp ""
       "Regexp for `string-trim' (left) used by `ert-resource-directory'.")
-    (defvar ert-resource-directory-trim-right-regexp "\\(-tests?\\)?\\.el"
+    (defvar ert-resource-directory-trim-right-regexp
+      (rx (? "-test" (? "s")) ".el")
       "Regexp for `string-trim' (right) used by `ert-resource-directory'.")
 
     (defmacro ert-resource-directory ()
@@ -204,7 +205,7 @@ being the result.")
     ;; Remove old test files.
     (dolist (dir `(,temporary-file-directory
 		   ,ert-remote-temporary-file-directory))
-      (dolist (file (directory-files dir 'full "\\`\\(\\.#\\)?tramp-test"))
+      (dolist (file (directory-files dir 'full (rx bos (? ".#") "tramp-test")))
 	(ignore-errors
 	  (if (file-directory-p file)
 	      (delete-directory file 'recursive)
@@ -387,15 +388,17 @@ Also see `ignore'."
 	  ;; `tramp-ignored-file-name-regexp' suppresses Tramp.
 	  (let ((tramp-ignored-file-name-regexp "^/method:user@host:"))
 	    (should-not (tramp-tramp-file-p "/method:user@host:")))
-	  ;; Methods shall be at least two characters on MS Windows,
-	  ;; except the default method.
+	  ;; Methods shall be at least two characters, except the
+	  ;; default method.
 	  (let ((system-type 'windows-nt))
 	    (should-not (tramp-tramp-file-p "/c:/path/to/file"))
 	    (should-not (tramp-tramp-file-p "/c::/path/to/file"))
-	    (should (tramp-tramp-file-p "/-::/path/to/file")))
+	    (should (tramp-tramp-file-p "/-::/path/to/file"))
+	    (should (tramp-tramp-file-p "/mm::/path/to/file")))
 	  (let ((system-type 'gnu/linux))
+	    (should-not (tramp-tramp-file-p "/m::/path/to/file"))
 	    (should (tramp-tramp-file-p "/-:h:/path/to/file"))
-	    (should (tramp-tramp-file-p "/m::/path/to/file"))))
+	    (should (tramp-tramp-file-p "/mm::/path/to/file"))))
 
       ;; Exit.
       (tramp-change-syntax syntax))))
@@ -1064,8 +1067,7 @@ Also see `ignore'."
 		   (file-remote-p "/user@email@host:")
 		   (format "/%s@%s:" "user@email" "host")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/user@email@host:" 'method) "default-method"))
+		   (file-remote-p "/user@email@host:" 'method) "default-method"))
 	  (should (string-equal
 		   (file-remote-p "/user@email@host:" 'user) "user@email"))
 	  (should (string-equal
@@ -1474,11 +1476,10 @@ Also see `ignore'."
 		   (file-remote-p "/[method/user@email@host]")
 		   (format "/[%s/%s@%s]" "method" "user@email" "host")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[method/user@email@host]" 'method) "method"))
+		   (file-remote-p "/[method/user@email@host]" 'method) "method"))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[method/user@email@host]" 'user) "user@email"))
+		   (file-remote-p "/[method/user@email@host]" 'user)
+		   "user@email"))
 	  (should (string-equal
 		   (file-remote-p "/[method/user@email@host]" 'host) "host"))
 	  (should (string-equal
@@ -1505,11 +1506,10 @@ Also see `ignore'."
 		   (file-remote-p "/[/user@host#1234]")
 		   (format "/[%s/%s@%s]" "default-method" "user" "host#1234")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[/user@host#1234]" 'method) "default-method"))
+		   (file-remote-p "/[/user@host#1234]" 'method)
+		   "default-method"))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[/user@host#1234]" 'user) "user"))
+		   (file-remote-p "/[/user@host#1234]" 'user) "user"))
 	  (should (string-equal
 		   (file-remote-p "/[/user@host#1234]" 'host) "host#1234"))
 	  (should (string-equal
@@ -1535,11 +1535,10 @@ Also see `ignore'."
 		   (file-remote-p "/[-/user@host#1234]")
 		   (format "/[%s/%s@%s]" "default-method" "user" "host#1234")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[-/user@host#1234]" 'method) "default-method"))
+		   (file-remote-p "/[-/user@host#1234]" 'method)
+		   "default-method"))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[-/user@host#1234]" 'user) "user"))
+		   (file-remote-p "/[-/user@host#1234]" 'user) "user"))
 	  (should (string-equal
 		   (file-remote-p "/[-/user@host#1234]" 'host) "host#1234"))
 	  (should (string-equal
@@ -1569,8 +1568,7 @@ Also see `ignore'."
 	  (should (string-equal
 		   (file-remote-p "/[method/user@host#1234]" 'user) "user"))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[method/user@host#1234]" 'host) "host#1234"))
+		   (file-remote-p "/[method/user@host#1234]" 'host) "host#1234"))
 	  (should (string-equal
 		   (file-remote-p "/[method/user@host#1234]" 'localname) ""))
 	  (should (string-equal
@@ -1595,8 +1593,7 @@ Also see `ignore'."
 		   (file-remote-p "/[/user@1.2.3.4]")
 		   (format "/[%s/%s@%s]" "default-method" "user" "1.2.3.4")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[/user@1.2.3.4]" 'method) "default-method"))
+		   (file-remote-p "/[/user@1.2.3.4]" 'method) "default-method"))
 	  (should (string-equal
 		   (file-remote-p "/[/user@1.2.3.4]" 'user) "user"))
 	  (should (string-equal
@@ -1624,8 +1621,7 @@ Also see `ignore'."
 		   (file-remote-p "/[-/user@1.2.3.4]")
 		   (format "/[%s/%s@%s]" "default-method" "user" "1.2.3.4")))
 	  (should (string-equal
-		   (file-remote-p
-		    "/[-/user@1.2.3.4]" 'method) "default-method"))
+		   (file-remote-p "/[-/user@1.2.3.4]" 'method) "default-method"))
 	  (should (string-equal
 		   (file-remote-p "/[-/user@1.2.3.4]" 'user) "user"))
 	  (should (string-equal
@@ -2299,9 +2295,9 @@ This checks also `file-name-as-directory', `file-name-directory',
 
     ;; Check `directory-abbrev-alist' abbreviation.
     (let ((directory-abbrev-alist
-           `((,(concat "\\`" (regexp-quote home-dir) "/foo")
+           `((,(rx bos (literal home-dir) "/foo")
               . ,(concat home-dir "/f"))
-             (,(concat "\\`" (regexp-quote remote-host) "/nowhere")
+             (,(rx bos (literal remote-host) "/nowhere")
               . ,(concat remote-host "/nw")))))
       (should (equal (abbreviate-file-name (concat home-dir "/foo/bar"))
                      (concat remote-host-nohop "~/f/bar")))
@@ -2514,8 +2510,8 @@ This checks also `file-name-as-directory', `file-name-directory',
 		     (string-match-p
 		      (if (and (null noninteractive)
 			       (or (eq visit t) (null visit) (stringp visit)))
-			  (format "^Wrote %s\n\\'" (regexp-quote tmp-name))
-			"^\\'")
+			  (rx bol "Wrote " (literal tmp-name) "\n" eos)
+			(rx bos))
 		      tramp--test-messages))))))
 
 	    ;; We do not test lockname here.  See
@@ -3215,38 +3211,40 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	    (with-temp-buffer
 	      (insert-directory tmp-name1 nil)
 	      (goto-char (point-min))
-	      (should (looking-at-p (regexp-quote tmp-name1))))
+	      (should (looking-at-p (rx (literal tmp-name1)))))
 	    (with-temp-buffer
 	      (insert-directory (file-name-as-directory tmp-name1) nil)
 	      (goto-char (point-min))
 	      (should
                (looking-at-p
-                (regexp-quote (file-name-as-directory tmp-name1)))))
+                (rx (literal (file-name-as-directory tmp-name1))))))
 	    (with-temp-buffer
 	      (insert-directory tmp-name1 "-al")
 	      (goto-char (point-min))
 	      (should
-	       (looking-at-p (format "^.+ %s$" (regexp-quote tmp-name1)))))
+	       (looking-at-p (rx bol (+ nonl) " " (literal tmp-name1) eol))))
 	    (with-temp-buffer
 	      (insert-directory (file-name-as-directory tmp-name1) "-al")
 	      (goto-char (point-min))
 	      (should
-	       (looking-at-p (format "^.+ %s/$" (regexp-quote tmp-name1)))))
-	    (let ((directory-files (directory-files tmp-name1)))
-	      (with-temp-buffer
-		(insert-directory
-		 (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p)
-		(goto-char (point-min))
-		(should
-		 (looking-at-p
-		  (concat
+	       (looking-at-p
+		(rx bol (+ nonl) " " (literal tmp-name1) "/" eol))))
+	    (with-temp-buffer
+	      (insert-directory
+	       (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p)
+	      (goto-char (point-min))
+	      (should
+	       (looking-at-p
+		(rx-to-string
+		 `(:
 		   ;; There might be a summary line.
-		   "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?"
+		   (? "total" (+ nonl) (+ digit) (? " ")
+		      (? (any "EGKMPTYZk")) (? "i") (? "B") "\n")
 		   ;; We don't know in which order ".", ".." and "foo" appear.
-		   (format
-		    "\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}"
-		    (regexp-opt directory-files)
-		    (length directory-files)))))))
+		   (= ,(length (directory-files tmp-name1))
+		      (+ nonl) " "
+		      (regexp ,(regexp-opt (directory-files tmp-name1)))
+		      (? " ->" (+ nonl)) "\n"))))))
 
 	    ;; Check error cases.
 	    (when (and (tramp--test-supports-set-file-modes-p)
@@ -3274,7 +3272,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 (ert-deftest tramp-test17-dired-with-wildcards ()
   "Check `dired' with wildcards."
   ;; `separate' syntax and IPv6 host name syntax do not work.
-  (skip-unless (not (string-match-p "\\[" ert-remote-temporary-file-directory)))
+  (skip-unless
+   (not (string-match-p (rx "[") ert-remote-temporary-file-directory)))
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))
   (skip-unless (not (tramp--test-rsync-p)))
@@ -3313,15 +3312,15 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name1 ert-remote-temporary-file-directory))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name1 ert-remote-temporary-file-directory)))))
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name2 ert-remote-temporary-file-directory)))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name2 ert-remote-temporary-file-directory))))))
 	    (kill-buffer buffer)
 
 	    ;; Check for expanded directory and file names.
@@ -3333,16 +3332,16 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name3 ert-remote-temporary-file-directory))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name3 ert-remote-temporary-file-directory)))))
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name4
-		  ert-remote-temporary-file-directory)))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name4
+		      ert-remote-temporary-file-directory))))))
 	    (kill-buffer buffer)
 
 	    ;; Check for special characters.
@@ -3361,16 +3360,16 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name3 ert-remote-temporary-file-directory))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name3 ert-remote-temporary-file-directory)))))
 	      (goto-char (point-min))
 	      (should
 	       (re-search-forward
-		(regexp-quote
-		 (file-relative-name
-		  tmp-name4
-		  ert-remote-temporary-file-directory)))))
+		(rx (literal
+		     (file-relative-name
+		      tmp-name4
+		      ert-remote-temporary-file-directory))))))
 	    (kill-buffer buffer))
 
 	;; Cleanup.
@@ -3420,7 +3419,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	       (string-equal
 		(dired-get-filename 'no-dir 'no-error)
 		(file-name-nondirectory tmp-name2)))
-	      (should-not (re-search-forward "dired" nil t))
+	      (should-not (search-forward "dired" nil t))
 	      ;; The copied file has been inserted the line before.
 	      (forward-line -1)
 	      (should
@@ -3766,14 +3765,15 @@ They might differ only in time attributes or directory size."
 	       (tramp--test-file-attributes-equal-p
 		(file-attributes (car elt)) (cdr elt))))
 
-	    (setq attr (directory-files-and-attributes tmp-name2 nil "\\`b"))
+	    (setq attr (directory-files-and-attributes
+			tmp-name2 nil (rx bos "b")))
 	    (should (equal (mapcar #'car attr) '("bar" "boz")))
 
 	    ;; Check the COUNT arg.  It exists since Emacs 28.
 	    (when (tramp--test-emacs28-p)
 	      (with-no-warnings
 		(setq attr (directory-files-and-attributes
-			    tmp-name2 nil "\\`b" nil nil 1))
+			    tmp-name2 nil (rx bos "b") nil nil 1))
 		(should (equal (mapcar #'car attr) '("bar"))))))
 
 	;; Cleanup.
@@ -3879,8 +3879,8 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
   `(condition-case err
        (progn ,@body)
      (file-error
-      (unless (string-match-p "^error with add-name-to-file"
-			      (error-message-string err))
+      (unless (string-prefix-p "error with add-name-to-file"
+			       (error-message-string err))
 	(signal (car err) (cdr err))))))
 
 (ert-deftest tramp-test21-file-links ()
@@ -4653,7 +4653,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	      (let ((process-file-return-signal-string t))
 		(should
 		 (string-match-p
-		  "Interrupt\\|Signal 2"
+		  (rx (| "Interrupt" "Signal 2"))
 		  (process-file
 		   (tramp--test-shell-file-name)
 		   nil nil nil "-c" "kill -2 $$")))))
@@ -4733,7 +4733,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 		(insert-file-contents tmp-name)
 		(should
 		 (string-match-p
-		  "cat:.* No such file or directory" (buffer-string)))
+		  (rx "cat:" (* nonl) " No such file or directory")
+		  (buffer-string)))
 		(should-not (get-buffer-window (current-buffer) t))
 		(delete-file tmp-name))))
 
@@ -4883,8 +4884,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                       ;; On macOS, there is always newline conversion.
 		      ;; "telnet" converts \r to <CR><NUL> if `crlf'
 		      ;; flag is FALSE.  See telnet(1) man page.
-		      "66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
-		    "66\n6F\n6F\n0A\\(\n00\\)?\n0A\n")
+		      (rx "66\n6F\n6F\n0D" (? "\n00") "\n0A\n")
+		    (rx "66\n6F\n6F\n0A" (? "\n00") "\n0A\n"))
 		  (buffer-string))))
 
 	    ;; Cleanup.
@@ -5081,7 +5082,9 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
 	    (with-timeout (10 (tramp--test-timeout-handler))
 	      (while (accept-process-output proc 0 nil t)))
 	    ;; On some MS Windows systems, it returns "unknown signal".
-	    (should (string-match-p "unknown signal\\|killed" (buffer-string))))
+	    (should
+	     (string-match-p
+	      (rx (| "unknown signal" "killed")) (buffer-string))))
 
 	;; Cleanup.
 	(ignore-errors (delete-process proc)))
@@ -5114,7 +5117,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
 		  (delete-process proc)
 		  (should
 		   (string-match-p
-		    "cat:.* No such file or directory" (buffer-string)))))
+		    (rx "cat:" (* nonl) " No such file or directory")
+		    (buffer-string)))))
 
 	    ;; Cleanup.
 	    (ignore-errors (delete-process proc))
@@ -5141,7 +5145,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
 		(insert-file-contents tmp-name)
 		(should
 		 (string-match-p
-		  "cat:.* No such file or directory" (buffer-string)))))
+		  (rx "cat:" (* nonl) " No such file or directory")
+		  (buffer-string)))))
 
 	  ;; Cleanup.
 	  (ignore-errors (delete-process proc))
@@ -5192,8 +5197,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
                         ;; On macOS, there is always newline conversion.
 			;; "telnet" converts \r to <CR><NUL> if `crlf'
 			;; flag is FALSE.  See telnet(1) man page.
-			"66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
-		      "66\n6F\n6F\n0A\\(\n00\\)?\n0A\n")
+			(rx "66\n6F\n6F\n0D" (? "\n00") "\n0A\n")
+		      (rx "66\n6F\n6F\n0A" (? "\n00") "\n0A\n"))
 		    (buffer-string))))
 
 	      ;; Cleanup.
@@ -5672,7 +5677,7 @@ INPUT, if non-nil, is a string sent to the process."
 	;; Variable is set.
 	(should
 	 (string-match-p
-	  (regexp-quote envvar)
+	  (rx (literal envvar))
 	  (funcall this-shell-command-to-string "set"))))
 
       (unless (tramp-direct-async-process-p)
@@ -5699,7 +5704,7 @@ INPUT, if non-nil, is a string sent to the process."
 	    ;; Variable is unset.
 	    (should-not
 	     (string-match-p
-	      (regexp-quote envvar)
+	      (rx (literal envvar))
 	      ;; We must remove PS1, the output is truncated otherwise.
 	      ;; We must suppress "_=VAR...".
 	      (funcall
@@ -5851,7 +5856,7 @@ INPUT, if non-nil, is a string sent to the process."
 	    (with-timeout (10)
 	      (while (accept-process-output
 		      (get-buffer-process (current-buffer)) nil nil t)))
-	    (should (string-match-p "^foo$" (buffer-string)))))
+	    (should (string-match-p (rx bol "foo" eol) (buffer-string)))))
 
       ;; Cleanup.
       (put 'explicit-shell-file-name 'permanent-local nil)
@@ -6369,7 +6374,7 @@ INPUT, if non-nil, is a string sent to the process."
 	    ;; When `lock-file-name-transforms' is set, another lock
 	    ;; file is used.
 	    (tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
-	    (let ((lock-file-name-transforms `((".*" ,tmp-name2))))
+	    (let ((lock-file-name-transforms `((,(rx (* nonl)) ,tmp-name2))))
 	      (should
 	       (string-equal
 		(with-no-warnings (make-lock-file-name tmp-name1))
@@ -6495,10 +6500,12 @@ INPUT, if non-nil, is a string sent to the process."
 		      (insert "bar")
 		      (when create-lockfiles
 			(should (string-match-p
-				 (format
-				  "^%s changed on disk; really edit the buffer\\?"
-				  (if (tramp--test-crypt-p)
-				      ".+" (file-name-nondirectory tmp-name)))
+				 (rx-to-string
+				  `(: bol
+				      ,(if (tramp--test-crypt-p)
+					   '(+ nonl)
+					 (file-name-nondirectory tmp-name))
+				      " changed on disk; really edit the buffer?"))
 				 captured-messages))
 			(should (file-locked-p tmp-name)))))
 
@@ -6589,7 +6596,7 @@ This is used in tests which we don't want to tag
                          :body nil :tags '(:tramp-asynchronous-processes))))
    ;; tramp-adb.el cannot apply multi-byte commands.
    (not (and (tramp--test-adb-p)
-	     (string-match-p "[[:multibyte:]]" default-directory)))))
+	     (string-match-p (rx multibyte) default-directory)))))
 
 (defun tramp--test-crypt-p ()
   "Check, whether the remote directory is encrypted."
@@ -6614,8 +6621,8 @@ completely."
   "Check, whether an FTP-like method is used.
 This does not support globbing characters in file names (yet)."
   ;; Globbing characters are ??, ?* and ?\[.
-  (string-match-p
-   "ftp$" (file-remote-p ert-remote-temporary-file-directory 'method)))
+  (string-suffix-p
+   "ftp" (file-remote-p ert-remote-temporary-file-directory 'method)))
 
 (defun tramp--test-fuse-p ()
   "Check, whether an FUSE file system isused."
@@ -6638,7 +6645,7 @@ If optional METHOD is given, it is checked first."
 Several special characters do not work properly there."
   ;; We must refill the cache.  `file-truename' does it.
   (file-truename ert-remote-temporary-file-directory)
-  (ignore-errors (tramp-check-remote-uname tramp-test-vec "^HP-UX")))
+  (ignore-errors (tramp-check-remote-uname tramp-test-vec (rx bol "HP-UX"))))
 
 (defun tramp--test-ksh-p ()
   "Check, whether the remote shell is ksh.
@@ -6646,8 +6653,9 @@ ksh93 makes some strange conversions of non-latin characters into
 a $'' syntax."
   ;; We must refill the cache.  `file-truename' does it.
   (file-truename ert-remote-temporary-file-directory)
-  (string-match-p
-   "ksh$" (tramp-get-connection-property tramp-test-vec "remote-shell" "")))
+  (string-suffix-p
+   "ksh"
+   (tramp-get-connection-property tramp-test-vec "remote-shell" "")))
 
 (defun tramp--test-macos-p ()
   "Check, whether the remote host runs macOS."
@@ -6695,7 +6703,7 @@ Additionally, ls does not support \"--dired\"."
   "Check, whether the method needs a share."
   (and (tramp--test-gvfs-p)
        (string-match-p
-	"^\\(afp\\|davs?\\|smb\\)$"
+	(rx bol (or "afp" (: "dav" (opt "s")) "smb") eol)
 	(file-remote-p ert-remote-temporary-file-directory 'method))))
 
 (defun tramp--test-sshfs-p ()
@@ -6747,7 +6755,7 @@ This requires restrictions of file name syntax."
       ;; Not all tramp-gvfs.el methods support changing the file mode.
       (and
        (tramp--test-gvfs-p)
-       (string-match-p
+       (string-suffix-p
 	"ftp" (file-remote-p ert-remote-temporary-file-directory 'method)))))
 
 (defun tramp--test-check-files (&rest files)
@@ -6896,14 +6904,14 @@ This requires restrictions of file name syntax."
 		    (should
 		     (string-equal
 		      (caar (directory-files-and-attributes
-			     file1 nil (regexp-quote elt1)))
+			     file1 nil (rx (literal elt1))))
 		      elt1))
 		    (should
 		     (string-equal
 		      (funcall
 		       (if quoted #'tramp-compat-file-name-quote #'identity)
 		       (cadr (car (directory-files-and-attributes
-				   file1 nil (regexp-quote elt1)))))
+				   file1 nil (rx (literal elt1))))))
 		      (file-remote-p (file-truename file2) 'localname)))
 		    (delete-file file3)
 		    (should-not (file-exists-p file3))))
@@ -6958,10 +6966,8 @@ This requires restrictions of file name syntax."
 		    (goto-char (point-min))
 		    (should
 		     (re-search-forward
-		      (format
-		       "^%s=%s$"
-		       (regexp-quote envvar)
-		       (regexp-quote (getenv envvar))))))))))
+		      (rx bol (literal envvar)
+			  "=" (literal (getenv envvar)) eol))))))))
 
 	;; Cleanup.
 	(ignore-errors (kill-buffer buffer))
@@ -7093,7 +7099,7 @@ This requires restrictions of file name syntax."
 	     ;; ?\n and ?/ shouldn't be part of any file name.  ?\t,
 	     ;; ?. and ?? do not work for "smb" method.  " " does not
 	     ;; work at begin or end of the string for MS Windows.
-	     (replace-regexp-in-string "[ \t\n/.?]" "" x)))
+	     (replace-regexp-in-string (rx (any " \t\n/.?")) "" x)))
 	  language-info-alist)))))))
 
 (tramp--test-deftest-with-stat tramp-test42-utf8)
@@ -7476,7 +7482,7 @@ process sentinels.  They shall not disturb each other."
 	  ert-remote-temporary-file-directory)))
     (should
      (string-match-p
-      "Tramp loaded: t[\n\r]+"
+      (rx "Tramp loaded: t" (+ (any "\n\r")))
       (shell-command-to-string
        (format
 	"%s -batch -Q -L %s --eval %s"
@@ -7503,9 +7509,9 @@ process sentinels.  They shall not disturb each other."
     (dolist (tm '(t nil))
       (should
        (string-match-p
-	(format
-       "Tramp loaded: nil[\n\r]+Tramp loaded: nil[\n\r]+Tramp loaded: %s[\n\r]+"
-	 tm)
+	(rx "Tramp loaded: nil" (+ (any "\n\r"))
+	    "Tramp loaded: nil" (+ (any "\n\r"))
+	    "Tramp loaded: " (literal (symbol-name tm)) (+ (any "\n\r")))
 	(shell-command-to-string
 	 (format
 	  "%s -batch -Q -L %s --eval %s"
@@ -7550,11 +7556,10 @@ process sentinels.  They shall not disturb each other."
 	    (tramp-cleanup-all-connections))"))
     (should
      (string-match-p
-      (format
-       "Loading %s"
-       (regexp-quote
-        (expand-file-name
-         "tramp-cmds" (file-name-directory (locate-library "tramp")))))
+      (rx "Loading "
+	  (literal
+           (expand-file-name
+            "tramp-cmds" (file-name-directory (locate-library "tramp")))))
       (shell-command-to-string
        (format
 	"%s -batch -Q -L %s -l tramp-sh --eval %s"
@@ -7595,11 +7600,13 @@ Since it unloads Tramp, it shall be the last test to run."
      (and (or (and (boundp x) (null (local-variable-if-set-p x)))
 	      (and (functionp x) (null (autoloadp (symbol-function x))))
 	      (macrop x))
-	  (string-match-p "^tramp" (symbol-name x))
+	  (string-prefix-p "tramp" (symbol-name x))
 	  ;; `tramp-completion-mode' is autoloaded in Emacs < 28.1.
 	  (not (eq 'tramp-completion-mode x))
-	  (not (string-match-p "^tramp\\(-archive\\)?--?test" (symbol-name x)))
-	  (not (string-match-p "unload-hook$" (symbol-name x)))
+	  (not (string-match-p
+		(rx bol "tramp" (? "-archive") (** 1 2 "-") "test")
+		(symbol-name x)))
+	  (not (string-suffix-p "unload-hook" (symbol-name x)))
 	  (not (get x 'tramp-autoload))
 	  (ert-fail (format "`%s' still bound" x)))))
 
@@ -7609,7 +7616,7 @@ Since it unloads Tramp, it shall be the last test to run."
   (mapatoms
    (lambda (x)
      (and (functionp x) (null (autoloadp (symbol-function x)))
-          (string-match-p "tramp-file-name" (symbol-name x))
+          (string-prefix-p "tramp-file-name" (symbol-name x))
           (ert-fail (format "Structure function `%s' still exists" x)))))
 
   ;; There shouldn't be left a hook function containing a Tramp
@@ -7617,8 +7624,9 @@ Since it unloads Tramp, it shall be the last test to run."
   (mapatoms
    (lambda (x)
      (and (boundp x)
-	  (string-match-p "-\\(hook\\|function\\)s?$" (symbol-name x))
-	  (not (string-match-p "unload-hook$" (symbol-name x)))
+	  (string-match-p
+	   (rx "-" (| "hook" "function") (? "s") eol) (symbol-name x))
+	  (not (string-suffix-p "unload-hook" (symbol-name x)))
 	  (consp (symbol-value x))
 	  (ignore-errors (all-completions "tramp" (symbol-value x)))
 	  (ert-fail (format "Hook `%s' still contains Tramp function" x)))))
@@ -7629,7 +7637,7 @@ Since it unloads Tramp, it shall be the last test to run."
      (and (functionp x)
 	  (advice-mapc
 	   (lambda (fun _symbol)
-	     (and (string-match-p "^tramp" (symbol-name fun))
+	     (and (string-prefix-p "tramp" (symbol-name fun))
 		  (ert-fail
 		   (format "Function `%s' still contains Tramp advice" x))))
 	   x))))
@@ -7646,7 +7654,7 @@ If INTERACTIVE is non-nil, the tests are run interactively."
   (interactive "p")
   (funcall
    (if interactive #'ert-run-tests-interactively #'ert-run-tests-batch)
-   "^tramp"))
+   (rx bol "tramp")))
 
 ;; TODO: