---

steveklabnik · steveklabnik · commit 68b46dea9be3 · 2015-01-17T15:25:42.000-05:00
yaml --- r: 174233 b: refs/heads/batch c: 6553c0f h: refs/heads/master i: 174231: f162ed3 v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 69e9b462e97090683ccb112158dee63098661089
+refs/heads/batch: 6553c0f5eb7cb903b698431556ade4e954dcb4e6
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
diff --git a/branches/batch/src/doc/trpl/ffi.md b/branches/batch/src/doc/trpl/ffi.md
@@ -529,6 +529,7 @@ fairly easy, but requires a few things:
 pub extern fn hello_rust() -> *const u8 {
     "Hello, world!\0".as_ptr()
 }
+# fn main() {}
 ```
 
 The `extern` makes this function adhere to the C calling convention, as

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ fairly easy, but requires a few things:`
`529`	`529`	`pub extern fn hello_rust() -> *const u8 {`
`530`	`530`	`"Hello, world!\0".as_ptr()`
`531`	`531`	`}`
	`532`	`+# fn main() {}`
`532`	`533`	```
`533`	`534`
`534`	`535`	The `extern` makes this function adhere to the C calling convention, as