rollup merge of rust-lang#20157: alexcrichton/issue-20068

alexcrichton · Jan 2, 2015 · 5696ea5 · 5696ea5
2 parents 71b46b1 + 76e3bc2
commit 5696ea5
Show file tree

Hide file tree

Showing 315 changed files with 1,699 additions and 1,233 deletions.
diff --git a/src/compiletest/compiletest.rs b/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};

diff --git a/src/doc/guide-ffi.md b/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")]