[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode 8733792 448/486: Drop Emacs-24
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode 8733792 448/486: Drop Emacs-24 |
Date: |
Sat, 7 Aug 2021 09:26:12 -0400 (EDT) |
branch: elpa/rust-mode
commit 8733792250169d7c2234d6eec710ae4ba37c15e5
Author: Phillip Lord <phillip.lord@russet.org.uk>
Commit: Nathan Moreau <nathan.moreau@m4x.org>
Drop Emacs-24
Emacs-24 is now two major versions behind and will soon be three, so
formally remove support for it.
---
.github/workflows/test.yml | 1 -
run_rust_emacs_tests_docker.sh | 6 ----
rust-mode.el | 75 ++----------------------------------------
3 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5e703b9..758a861 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,6 @@ jobs:
matrix:
rust_version: [stable]
emacs_version:
- - 24.5
- 25.1
- 25.2
- 25.3
diff --git a/run_rust_emacs_tests_docker.sh b/run_rust_emacs_tests_docker.sh
index 606e53e..e4de10f 100755
--- a/run_rust_emacs_tests_docker.sh
+++ b/run_rust_emacs_tests_docker.sh
@@ -6,16 +6,10 @@ docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w
/usr/src/app --ent
echo Testing Local files with Emacs 25
docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app
--entrypoint=/bin/bash silex/emacs:25.3-dev ./test-by-cp
-echo "Testing Local files with Emacs 24 (oldest)"
-docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app
--entrypoint=/bin/bash silex/emacs:24.5-dev ./test-by-cp
-
echo "Testing commits with Emacs 26 (latest)"
docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app
--entrypoint=/bin/bash silex/emacs:26.2-dev ./test-from-git
echo Testing commits with Emacs 25
docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app
--entrypoint=/bin/bash silex/emacs:25.3-dev ./test-from-git
-echo "Testing commits with Emacs 24 (oldest)"
-docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app
--entrypoint=/bin/bash silex/emacs:24.5-dev ./test-from-git
-
diff --git a/rust-mode.el b/rust-mode.el
index 9d6040b..6a0c1b5 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -4,7 +4,7 @@
;; Author: Mozilla
;; Url: https://github.com/rust-lang/rust-mode
;; Keywords: languages
-;; Package-Requires: ((emacs "24.0"))
+;; Package-Requires: ((emacs "25.1"))
;; This file is distributed under the terms of both the MIT license and the
;; Apache License (version 2.0).
@@ -28,13 +28,6 @@
(defvar rust-buffer-project)
(make-variable-buffer-local 'rust-buffer-project)
-;; for GNU Emacs < 24.3
-(eval-when-compile
- (unless (fboundp 'setq-local)
- (defmacro setq-local (var val)
- "Set variable VAR to value VAL in current buffer."
- (list 'set (list 'make-local-variable (list 'quote var)) val))))
-
(defun rust-re-word (inner) (concat "\\<" inner "\\>"))
(defun rust-re-grab (inner) (concat "\\(" inner "\\)"))
(defun rust-re-shy (inner) (concat "\\(?:" inner "\\)"))
@@ -2005,77 +1998,13 @@ visit the new file."
(goto-char old-point)))
(t
(when (rust-in-str)
- (rust--up-list -1 t t))
+ (up-list -1 t t))
(insert "(")
(forward-sexp)
(insert ")")
(backward-sexp)))
(insert "dbg!"))
-(defun rust--up-list (&optional arg escape-strings no-syntax-crossing)
- "Compatibility for emacs 24."
- (or arg (setq arg 1))
- (let ((inc (if (> arg 0) 1 -1))
- (pos nil))
- (while (/= arg 0)
- (condition-case err
- (save-restriction
- ;; If we've been asked not to cross string boundaries
- ;; and we're inside a string, narrow to that string so
- ;; that scan-lists doesn't find a match in a different
- ;; string.
- (when no-syntax-crossing
- (let* ((syntax (syntax-ppss))
- (string-comment-start (nth 8 syntax)))
- (when string-comment-start
- (save-excursion
- (goto-char string-comment-start)
- (narrow-to-region
- (point)
- (if (nth 3 syntax) ; in string
- (condition-case nil
- (progn (forward-sexp) (point))
- (scan-error (point-max)))
- (forward-comment 1)
- (point)))))))
- (if (null forward-sexp-function)
- (goto-char (or (scan-lists (point) inc 1)
- (buffer-end arg)))
- (condition-case err
- (while (progn (setq pos (point))
- (forward-sexp inc)
- (/= (point) pos)))
- (scan-error (goto-char (nth (if (> arg 0) 3 2) err))))
- (if (= (point) pos)
- (signal 'scan-error
- (list "Unbalanced parentheses" (point) (point))))))
- (scan-error
- (let ((syntax nil))
- (or
- ;; If we bumped up against the end of a list, see whether
- ;; we're inside a string: if so, just go to the beginning
- ;; or end of that string.
- (and escape-strings
- (or syntax (setf syntax (syntax-ppss)))
- (nth 3 syntax)
- (goto-char (nth 8 syntax))
- (progn (when (> inc 0)
- (forward-sexp))
- t))
- ;; If we narrowed to a comment above and failed to escape
- ;; it, the error might be our fault, not an indication
- ;; that we're out of syntax. Try again from beginning or
- ;; end of the comment.
- (and no-syntax-crossing
- (or syntax (setf syntax (syntax-ppss)))
- (nth 4 syntax)
- (goto-char (nth 8 syntax))
- (or (< inc 0)
- (forward-comment 1))
- (setf arg (+ arg inc)))
- (signal (car err) (cdr err))))))
- (setq arg (- arg inc)))))
-
;;;###autoload
(defun rust-dbg-wrap-or-unwrap ()
"Either remove or add the dbg! macro."
- [nongnu] elpa/rust-mode f6ebcbd 400/486: Update travis scripts to use EVM, (continued)
- [nongnu] elpa/rust-mode f6ebcbd 400/486: Update travis scripts to use EVM, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 077cba7 402/486: Add local docker based tests runner, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 1d42d69 416/486: Speed up line indentation inside strings (#313), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4a7a860 480/486: Properly markup two additional section headings, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a789a25 266/486: Fix #168: use while in rust-rewind-irrelevant, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 936a187 276/486: handle indirect buffers and multiple windows in rust-format-buffer, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 09efc45 320/486: Merge pull request #219 from Aankhen/highlight-question-mark, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b10ad41 326/486: Merge pull request #220 from Aankhen/highlight-string-interpolation, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode d71fe94 307/486: restore points when an error occurs too, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 1b3db88 422/486: Add a function wrap and unwrap with the dbg! macro., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8733792 448/486: Drop Emacs-24,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 9eb2c63 460/486: Fix README internal link (#389), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 13c4335 462/486: Improve doc-strings, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c23453d 463/486: rearrange I: Move options and faces to beginning of file, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 649f492 484/486: Create rust-cargo.el from existing code, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 198c777 386/486: Replaced font-lock-fontify-buffer with font-lock-ensure, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a871d10 390/486: Merge pull request #298 from jjwest/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 0a94268 396/486: Merge pull request #307 from Bunogi/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 86bc286 401/486: Add specific distribution for EVM, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 06b3b60 412/486: update readme (#327), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c0cc6dc 420/486: Allow pass custom flags to rustfmt. (#338), ELPA Syncer, 2021/08/07