master 99d4d65cc2c: Require `cl-lib` rather than directly some of its subfiles

[Stefan Monnier]

branch: master
commit 99d4d65cc2cd98537ef58afeace81a11ad2ff6c2
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Require `cl-lib` rather than directly some of its subfiles
    
    * test/src/filelock-tests.el:
    * lisp/net/tramp-sh.el: Require `cl-lib` rather than `cl-seq` or `cl-macs`.
---
 lisp/net/tramp-sh.el       | 3 +--
 test/src/filelock-tests.el | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ba6dbdf0c39..49acf8395c5 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -31,8 +31,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
-(require 'cl-seq)
+(require 'cl-lib)
 (require 'tramp)
 
 ;; `dired-*' declarations can be removed, starting with Emacs 29.1.
diff --git a/test/src/filelock-tests.el b/test/src/filelock-tests.el
index f4376b2a5b0..f4ae7192796 100644
--- a/test/src/filelock-tests.el
+++ b/test/src/filelock-tests.el
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'cl-macs)
+(require 'cl-lib)
 (require 'ert)
 (require 'ert-x)
 (require 'seq)