From 5dc9e2f2713b80500d47be817b1d290e68e69734 Mon Sep 17 00:00:00 2001 From: madand Date: Sun, 15 Dec 2019 15:46:00 +0200 Subject: [PATCH] Fix CI builds by reverting a breaking change to `mocker.el` The change was introduced by #13059. mocker.el is a large piece of legacy code that depends on deprecated functionality in EIEIO and cannot be trivially converted to use `cl-lib` by search and replace. --- core/libs/mocker.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/libs/mocker.el b/core/libs/mocker.el index e658143fa..525db46d2 100644 --- a/core/libs/mocker.el +++ b/core/libs/mocker.el @@ -29,7 +29,7 @@ ;;; Code: (eval-when-compile - (require 'cl-lib)) + (require 'cl)) (require 'eieio) @@ -64,7 +64,7 @@ (records :initarg :records :initform nil :type list))) (defmethod constructor :static ((mock mocker-mock) newname &rest args) - (let* ((obj (cl-call-next-method)) + (let* ((obj (call-next-method)) (recs (oref obj :records)) (func (oref obj :function))) (oset obj :orig-def (when (fboundp func) (symbol-function func))) @@ -164,7 +164,7 @@ (-sym :initarg :-sym))) (defmethod constructor :static ((rec mocker-record-base) newname &rest args) - (let* ((obj (cl-call-next-method)) + (let* ((obj (call-next-method)) (occur (oref obj :occur))) (when occur (oset obj :min-occur (max (oref obj :min-occur) @@ -213,7 +213,7 @@ (input-matcher :initarg :input-matcher :initform nil))) (defmethod constructor :static ((rec mocker-input-record) newname &rest args) - (let* ((obj (cl-call-next-method))) + (let* ((obj (call-next-method))) (when (or (not (slot-boundp obj :max-occur)) (and (oref obj :max-occur) (< (oref obj :max-occur) @@ -250,7 +250,7 @@ ((output :initarg :output :initform nil))) (defmethod constructor :static ((rec mocker-stub-record) newname &rest args) - (let* ((obj (cl-call-next-method))) + (let* ((obj (call-next-method))) (unless (slot-boundp obj :min-occur) (oset obj :min-occur 0)) (unless (slot-boundp obj :max-occur)