---

yaml
---
r: 122867
b: refs/heads/master
c: f37e202
h: refs/heads/master
i:
  122865: 5f07459
  122863: f12474b
v: v3

Author: iliekturtles

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: aaff4e05e19b48d81e4ecb3337f288f42d06edd0
+refs/heads/master: f37e202b53d208cd65f45fa96d2f2453b26bb9ee
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aaff4e05e19b48d81e4ecb3337f288f42d06edd0
 refs/heads/try: 2e9d9477b848cec778ca3f07ecdf0aea6ade23de

trunk/src/doc/guide.md

@@ -895,13 +895,14 @@ fn add_one(x: int) -> int {
 We would get an error:
 
 ```{ignore,notrust}
-note: consider removing this semicolon:
-     x + 1;
-          ^
 error: not all control paths return a value
 fn add_one(x: int) -> int {
      x + 1;
 }
+
+note: consider removing this semicolon:
+     x + 1;
+          ^
 ```
 
 Remember our earlier discussions about semicolons and `()`? Our function claims

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,12 +31,6 @@ 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')