Skip to content

Update compiler command #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2018
Merged

Update compiler command #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5ef207
Update compiler command to `cargo build`
dcorking Mar 1, 2018
44320de
Try to improve layout of current-snippet-file code
dcorking Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 33 additions & 32 deletions rust-playground.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,20 @@ By default confirmation required."
:keymap '(([C-return] . rust-playground-exec)))

(defun rust-playground-snippet-file-name(&optional snippet-name)
(setq-local rust-playground-current-snippet-file (let ((file-name (cond (snippet-name)
(rust-playground-ask-file-name
(read-string "Rust Playground filename: ")) ("snippet"))))
(concat (rust-playground-snippet-unique-dir file-name) "/" file-name ".rs"))))
(setq-local rust-playground-current-snippet-file
(let ((file-name
(cond (snippet-name)
(rust-playground-ask-file-name
(read-string "Rust Playground filename: ")) ("snippet"))))
(concat (rust-playground-snippet-unique-dir file-name) "/" file-name ".rs"))))

(defun rust-playground-exec ()
"Save the buffer then runs Rust compiler for executing the code."
"Save the buffer then run Rust compiler for executing the code."
(interactive)
(make-local-variable 'compile-command)
(let ((snippet-file buffer-file-name))
(save-buffer t)
(compile (concat rust-playground-bin " " (shell-quote-argument snippet-file) " -o snippet && "
(file-name-directory snippet-file) "snippet"))))
(save-buffer t)
(compile "cargo build")))

;;;###autoload
(defun rust-playground ()
Expand All @@ -101,21 +102,21 @@ By default confirmation required."
(let ((snippet-file-name (rust-playground-snippet-file-name)))
(switch-to-buffer (create-file-buffer snippet-file-name))
(add-hook 'kill-buffer-hook 'rust-playground-on-buffer-kill nil t)
(rust-playground-insert-template-head "snippet of code")
(insert "fn main() {
(rust-playground-insert-template-head "snippet of code")
(insert "fn main() {

println!(\"Results:\")

}")
(backward-char 3)
(rust-mode)
(rust-playground-mode)
(set-visited-file-name snippet-file-name t)))
(backward-char 3)
(rust-mode)
(rust-playground-mode)
(set-visited-file-name snippet-file-name t)))

; remove compiled binary from snippet dir but not touch source files
; remove compiled binary from snippet dir but not touch source files ;
(defun rust-playground-on-buffer-kill ()
(if (string-match-p (file-truename rust-playground-basedir) (file-truename (buffer-file-name)))
(delete-file (concat (file-name-directory (buffer-file-name)) "snippet"))))
(delete-file (concat (file-name-directory (buffer-file-name)) "snippet"))))

(defun rust-playground-insert-template-head (description)
(insert "// -*- mode:rust;mode:rust-playground -*-
Expand All @@ -128,20 +129,20 @@ By default confirmation required."
"))

;;;###autoload
(defun rust-playground-rm ()
(defun rust-playground-rm ()
"Remove files of the current snippet together with directory of this snippet."
(interactive)
(if (rust-playground-inside)
(if (or (not rust-playground-confirm-deletion)
(y-or-n-p (format "Do you want delete whole snippet dir %s? "
(file-name-directory (buffer-file-name)))))
(progn
(save-buffer)
(delete-directory (file-name-directory (buffer-file-name)) t t)
(remove-hook 'kill-buffer-hook 'rust-playground-on-buffer-kill t)
(kill-buffer)))
(message "Won't delete this! Because %s is not under the path %s. Remove the snippet manually!"
(buffer-file-name) rust-playground-basedir)))
(y-or-n-p (format "Do you want delete whole snippet dir %s? "
(file-name-directory (buffer-file-name)))))
(progn
(save-buffer)
(delete-directory (file-name-directory (buffer-file-name)) t t)
(remove-hook 'kill-buffer-hook 'rust-playground-on-buffer-kill t)
(kill-buffer)))
(message "Won't delete this! Because %s is not under the path %s. Remove the snippet manually!"
(buffer-file-name) rust-playground-basedir)))

;; ;;;###autoload
;; (defun rust-playground-download (url)
Expand All @@ -157,11 +158,11 @@ By default confirmation required."
;; (copy-to-buffer buffer (point) (point-max))
;; (kill-buffer)
;; (with-current-buffer buffer
;; (goto-char (point-min))
;; (rust-playground-insert-template-head (concat url " imported"))
;; (rust-mode)
;; (rust-playground-mode)
;; (set-visited-file-name snippet-file-name t)
;; (goto-char (point-min))
;; (rust-playground-insert-template-head (concat url " imported"))
;; (rust-mode)
;; (rust-playground-mode)
;; (set-visited-file-name snippet-file-name t)
;; (switch-to-buffer buffer)))))

;; (defun rust-playground-upload ()
Expand All @@ -182,7 +183,7 @@ By default confirmation required."
(defun rust-playground-inside ()
"It checks that minor mode is rusl-playground and buffer file placed under default directory."
(if (string-match-p (file-truename rust-playground-basedir) (file-truename (buffer-file-name)))
(bound-and-true-p rust-playground-mode)))
(bound-and-true-p rust-playground-mode)))

(provide 'rust-playground)
;;; rust-playground.el ends here