---

yaml
---
r: 167775
b: refs/heads/master
c: 0101bbe
h: refs/heads/master
i:
  167773: 41b64ad
  167771: 7d99564
  167767: d248850
  167759: 2ef05fd
  167743: 8104eaa
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f2ccdfd8914b7b8f8f8f2053f9ecd98d54ef95a6
+refs/heads/master: 0101bbe7acb38e8113c0cafeb7d5ae0be6448e5b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/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};

trunk/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")]