---

yaml
---
r: 143813
b: refs/heads/try2
c: cab6d46
h: refs/heads/master
i:
  143811: f8c416c
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c14e14e63aeefa5c94648dd921bd99a9dadeb060
+refs/heads/try2: cab6d46e58ea6f7535d8e454f0345eccfae183c4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustpkg/util.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::{os, result};
-use std::c_str::ToCStr;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
 use extra::getopts::groups::getopts;
@@ -373,7 +372,9 @@ pub fn link_exe(_src: &Path, _dest: &Path) -> bool {
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "macos")]
 pub fn link_exe(src: &Path, dest: &Path) -> bool {
+    use std::c_str::ToCStr;
     use std::libc;
+
     unsafe {
         do src.to_c_str().with_ref |src_buf| {
             do dest.to_c_str().with_ref |dest_buf| {