Revert "Prevent name clashes between CL structures and builtin types"

This reverts commit 151496a4b96430924bc148f85b9c8471d1e132b1.
That commit breaks bootstrap builds due to a cyclic dependency.

2 files changed, 0 insertions, 42 deletions

diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el
index 9236ac73b50..f0bde7af397 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -497,13 +497,4 @@ collection clause."
                           vconcat (vector (1+ x)))
                  [2 3 4 5 6])))
 
-
-(ert-deftest cl-defstruct/builtin-type ()
-  (should-error
-   (macroexpand '(cl-defstruct hash-table))
-   :type 'wrong-type-argument)
-  (should-error
-   (macroexpand '(cl-defstruct (hash-table (:predicate hash-table-p))))
-   :type 'wrong-type-argument))
-
 ;;; cl-macs-tests.el ends here
diff --git a/test/lisp/emacs-lisp/cl-preloaded-tests.el b/test/lisp/emacs-lisp/cl-preloaded-tests.el
deleted file mode 100644
index 008a6e629f5..00000000000
--- a/test/lisp/emacs-lisp/cl-preloaded-tests.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; cl-preloaded-tests.el --- unit tests for cl-preloaded.el  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2017 Free Software Foundation, Inc.
-;; Author: Philipp Stephani <phst@google.com>
-
-;; This file is part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Unit tests for lisp/emacs-lisp/cl-preloaded.el.
-
-;;; Code:
-
-(ert-deftest cl-struct-define/builtin-type ()
-  (should-error
-   (cl-struct-define 'hash-table nil nil 'record nil nil
-                     'cl-preloaded-tests-tag 'cl-preloaded-tests nil)
-   :type 'wrong-type-argument))
-
-;;; cl-preloaded-tests.el ends here