---

yaml
---
r: 168537
b: refs/heads/batch
c: 56290a0
h: refs/heads/master
i:
  168535: 817cad3
v: v3

Author: alexcrichton

[refs]

@@ -29,5 +29,5 @@ 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: 71b46b18a274edc7f7fb60b490e5ebbb9c911462
+refs/heads/batch: 56290a004493a5d2e211f056601533253497df60
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970

branches/batch/src/compiletest/compiletest.rs

@@ -22,8 +22,8 @@ extern crate regex;
 use std::os;
 use std::io;
 use std::io::fs;
-use std::str::FromStr;
-use std::thunk::{Thunk};
+use std::str::{FromStr, from_str};
+use std::thunk::Thunk;
 use getopts::{optopt, optflag, reqopt};
 use common::Config;
 use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Codegen};

branches/batch/src/doc/guide-ffi.md

@@ -450,6 +450,8 @@ them.
 
 ~~~no_run
 extern crate libc;
+
+use std::c_str::ToCStr;
 use std::ptr;
 
 #[link(name = "readline")]