From: bors <bors@rust-lang.org>
Date: Wed, 24 Jul 2013 20:25:36 +0000 (-0700)
Subject: auto merge of #7996 : erickt/rust/cleanup-strs, r=erickt
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=330378d1a1a97be85f1150242da277c00b7270f5;p=rust.git

auto merge of #7996 : erickt/rust/cleanup-strs, r=erickt

This is a cleanup pull request that does:

* removes `os::as_c_charp`
* moves `str::as_buf` and `str::as_c_str` into `StrSlice`
* converts some functions from `StrSlice::as_buf` to `StrSlice::as_c_str`
* renames `StrSlice::as_buf` to `StrSlice::as_imm_buf` (and adds `StrSlice::as_mut_buf` to match `vec.rs`.
* renames `UniqueStr::as_bytes_with_null_consume` to `UniqueStr::to_bytes`
* and other misc cleanups and minor optimizations
---

330378d1a1a97be85f1150242da277c00b7270f5
diff --cc src/librustc/middle/trans/glue.rs
index 024ab7af081,d66b43167ce..75f553f3971
--- a/src/librustc/middle/trans/glue.rs
+++ b/src/librustc/middle/trans/glue.rs
@@@ -37,11 -37,11 +37,10 @@@ use util::ppaux::ty_to_short_str
  
  use middle::trans::type_::Type;
  
 -use std::io;
  use std::libc::c_uint;
- use std::str;
  use syntax::ast;
  
 -pub fn trans_free(cx: block, v: ValueRef) -> block {
 +pub fn trans_free(cx: @mut Block, v: ValueRef) -> @mut Block {
      let _icx = push_ctxt("trans_free");
      callee::trans_lang_call(cx,
          langcall(cx, None, "", FreeFnLangItem),