---

yaml
---
r: 122865
b: refs/heads/master
c: 4c1fdd0
h: refs/heads/master
i:
  122863: f12474b
v: v3

Author: lilyball

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 98eb5f7498902de6ff19a1bb70155ca0cd16907c
+refs/heads/master: 4c1fdd065b28b85d879a01870525e2f0699262e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aaff4e05e19b48d81e4ecb3337f288f42d06edd0
 refs/heads/try: 2e9d9477b848cec778ca3f07ecdf0aea6ade23de

trunk/src/doc/tutorial.md

@@ -3038,7 +3038,7 @@ fn main() {
 ~~~{.ignore}
 // `b/mod.rs`
 pub mod c;
-pub fn foo() { println!("Foo!"); }
+pub fn foo() { println!("Foo!"; }
 ~~~
 
 ~~~{.ignore}

trunk/src/etc/vim/ftplugin/rust.vim

@@ -31,6 +31,12 @@ setlocal formatoptions-=t formatoptions+=croqnl
 " j was only added in 7.3.541, so stop complaints about its nonexistence
 silent! setlocal formatoptions+=j
 
+" smartindent will be overridden by indentexpr if filetype indent is on, but
+" otherwise it's better than nothing.
+setlocal smartindent nocindent
+
+setlocal tabstop=4 shiftwidth=4 expandtab
+
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')