---

yaml
---
r: 118731
b: refs/heads/snap-stage3
c: bd3bebc
h: refs/heads/master
i:
  118729: e3a0b72
  118727: b56a51e
v: v3

Author: lilyball

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: b1646cbfd908dc948b251e362669af421100647a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 303cadfbb3addd30dafdc2bcb5db994ab3bb30ab
+refs/heads/snap-stage3: bd3bebcf60793477da390471d6d00a5523d716b4
 refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/vim/autoload/rust.vim

@@ -118,7 +118,7 @@ function! s:Expand(path, pretty, args)
 endfunction
 
 function! rust#CompleteExpand(lead, line, pos)
-	if a:line[: a:pos-1] =~ '^Expand!\s*\S*$'
+	if a:line[: a:pos-1] =~ '^RustExpand!\s*\S*$'
 		" first argument and it has a !
 		let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph="]
 		if !empty(a:lead)

branches/snap-stage3/src/etc/vim/ftplugin/rust.vim

@@ -60,24 +60,24 @@ onoremap <silent> <buffer> ]] :call rust#Jump('o', 'Forward')<CR>
 
 " Commands {{{1
 
-" :Run will compile and run the current file. If it has unsaved changes, they
-" will be saved first. If it has no path, it will be written to a temporary
-" file first. The generated binary is always placed in a temporary directory,
-" but run from the current directory.
+" :RustRun will compile and run the current file. If it has unsaved changes,
+" they will be saved first. If it has no path, it will be written to a
+" temporary file first. The generated binary is always placed in a temporary
+" directory, but run from the current directory.
 "
-" The arguments passed to :Run will be passed to the generated binary.
+" The arguments passed to :RustRun will be passed to the generated binary.
 "
 " If ! is specified, the arguments are given to rustc as well. A -- argument
 " separates rustc args from the args passed to the binary.
 "
 " If g:rustc_path is defined, it is used as the path to rustc. Otherwise it is
 " assumed that rustc is in $PATH.
-command! -nargs=* -complete=file -bang -bar -buffer Run call rust#Run(<bang>0, [<f-args>])
+command! -nargs=* -complete=file -bang -bar -buffer RustRun call rust#Run(<bang>0, [<f-args>])
 
-" :Expand will expand the current file using --pretty.
+" :RustExpand will expand the current file using --pretty.
 "
-" Any arguments given to :Expand will be passed to rustc. This is largely so
-" you can pass various --cfg configurations.
+" Any arguments given to :RustExpand will be passed to rustc. This is largely
+" so you can pass various --cfg configurations.
 "
 " If ! is specified, the first argument will be interpreted as the --pretty
 " type. Otherwise it will default to 'expanded'.
@@ -87,14 +87,14 @@ command! -nargs=* -complete=file -bang -bar -buffer Run call rust#Run(<bang>0, [
 "
 " If g:rustc_path is defined, it is used as the path to rustc. Otherwise it is
 " assumed that rustc is in $PATH.
-command! -nargs=* -complete=customlist,rust#CompleteExpand -bang -bar -buffer Expand call rust#Expand(<bang>0, [<f-args>])
+command! -nargs=* -complete=customlist,rust#CompleteExpand -bang -bar -buffer RustExpand call rust#Expand(<bang>0, [<f-args>])
 
 " Mappings {{{1
 
-" Bind ⌘R in MacVim to :Run
-nnoremap <silent> <buffer> <D-r> :Run<CR>
-" Bind ⌘⇧R in MacVim to :Run! pre-filled with the last args
-nnoremap <buffer> <D-R> :Run! <C-r>=join(b:rust_last_rustc_args)<CR><C-\>erust#AppendCmdLine(' -- ' . join(b:rust_last_args))<CR>
+" Bind ⌘R in MacVim to :RustRun
+nnoremap <silent> <buffer> <D-r> :RustRun<CR>
+" Bind ⌘⇧R in MacVim to :RustRun! pre-filled with the last args
+nnoremap <buffer> <D-R> :RustRun! <C-r>=join(b:rust_last_rustc_args)<CR><C-\>erust#AppendCmdLine(' -- ' . join(b:rust_last_args))<CR>
 
 if !exists("b:rust_last_rustc_args") || !exists("b:rust_last_args")
 	let b:rust_last_rustc_args = []
@@ -112,8 +112,8 @@ let b:undo_ftplugin = "
 		  \|unlet! b:delimitMate_excluded_regions
 		\|endif
 		\|unlet! b:rust_last_rustc_args b:rust_last_args
-		\|delcommand Run
-		\|delcommand Expand
+		\|delcommand RustRun
+		\|delcommand RustExpand
 		\|nunmap <buffer> <D-r>
 		\|nunmap <buffer> <D-R>
 		\|nunmap <buffer> [[