[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode da747ed452 3/5: more test fixing
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode da747ed452 3/5: more test fixing |
Date: |
Fri, 19 Aug 2022 08:59:50 -0400 (EDT) |
branch: elpa/rust-mode
commit da747ed4523b947e7e367ca244bda0363c3cecc6
Author: brotzeit <brotzeitmacher@gmail.com>
Commit: brotzeit <brotzeitmacher@gmail.com>
more test fixing
---
rust-mode-tests.el | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index 07f5a466b3..6c967bf450 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -393,11 +393,11 @@ not_a_string();
"
- (apply 'append (mapcar (lambda (s) (list s 'font-lock-string-face))
- '("r\"foo\\\"" "\"bar\"" "r\"bar\""
- "r\"foo\\.\"" "\"bar\"" "r\"bar\""
- "r\"foo\\..\"" "\"bar\"" "r\"foo\\..\\bar\""
- "r\"\\\"" "\"foo\"" "r\"\\foo\"")))
+ (apply #'append (mapcar (lambda (s) (list s 'font-lock-string-face))
+ '("r\"foo\\\"" "\"bar\"" "r\"bar\""
+ "r\"foo\\.\"" "\"bar\"" "r\"bar\""
+ "r\"foo\\..\"" "\"bar\"" "r\"foo\\..\\bar\""
+ "r\"\\\"" "\"foo\"" "r\"\\foo\"")))
))
(ert-deftest font-lock-raw-string-after-normal-string-ending-in-r ()
@@ -3306,7 +3306,7 @@ type Foo<T> where T: Copy = Box<T>;
(ert-deftest redo-syntax-after-change-far-from-point ()
(let*
((tmp-file-name (make-temp-file "rust-mdoe-test-issue104"))
- (base-contents (apply 'concat (append '("fn foo() {\n\n}\n") (make-list
500 "// More stuff...\n") '("fn bar() {\n\n}\n")))))
+ (base-contents (apply #'concat (append '("fn foo() {\n\n}\n")
(make-list 500 "// More stuff...\n") '("fn bar() {\n\n}\n")))))
;; Create the temp file...
(with-temp-file tmp-file-name
(insert base-contents))
@@ -3481,12 +3481,11 @@ impl Two<'a> {
#'rust-dbg-wrap-or-unwrap
"let x = dbg!(\"foo, bar\")"))
-(when (executable-find rust-cargo-bin)
- (ert-deftest rust-test-project-located ()
- (let* ((test-dir (expand-file-name "test-project/" default-directory))
- (manifest-file (expand-file-name "Cargo.toml" test-dir)))
- (let ((default-directory test-dir))
- (should (equal (expand-file-name (rust-buffer-project))
manifest-file))))))
+(ert-deftest rust-test-project-located ()
+ (let* ((test-dir (expand-file-name "test-project/" default-directory))
+ (manifest-file (expand-file-name "Cargo.toml" test-dir)))
+ (let ((default-directory test-dir))
+ (should (equal (expand-file-name (rust-buffer-project))
manifest-file)))))
(defun rust-collect-matches (spec)
(let ((matches nil))
@@ -3632,5 +3631,6 @@ impl Two<'a> {
`(should
(or
(string-match "Prefix Command" ,match)
- (string-match "^C-c C" ,match)))))
+ (string-match "^C-c C" ,match)))
+ t))
(should (< 0 match-count)))))