diff --git a/src/etc/vim/indent/rust.vim b/src/etc/vim/indent/rust.vim
index 43fd917fc97..8d973c9a870 100644
--- a/src/etc/vim/indent/rust.vim
+++ b/src/etc/vim/indent/rust.vim
@@ -5,4 +5,7 @@ if exists("b:did_indent")
 endif
 
 let b:did_indent = 1
-setlocal smartindent
+
+setlocal cindent
+setlocal cinoptions=L0,(0,Ws,JN
+setlocal cinkeys=0{,0},!^F,o,O