diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-22 21:41:46 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-23 16:56:22 -0700 |
| commit | 7af56bb92199eabcfee52c43739761b18872a2c1 (patch) | |
| tree | 5a50c048e33bf6f655ac393facdb338d9650a619 /src/libstd/rt | |
| parent | 9fdec67a6761ae43d8fae80e10b5a7a1e0ca7c0d (diff) | |
| download | rust-7af56bb92199eabcfee52c43739761b18872a2c1.tar.gz rust-7af56bb92199eabcfee52c43739761b18872a2c1.zip | |
std: move StrUtil::as_c_str into StrSlice
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/logging.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvll.rs | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index 84186180aa6..11d11daebc2 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -46,17 +46,15 @@ impl Logger for StdErrLogger { /// per-module global logging flags based on the logging spec pub fn init(crate_map: *u8) { use os; - use str; + use str::StrSlice; use ptr; use option::{Some, None}; let log_spec = os::getenv("RUST_LOG"); match log_spec { Some(spec) => { - do str::as_c_str(spec) |s| { - unsafe { - rust_update_log_settings(crate_map, s); - } + do spec.as_c_str |buf| { + unsafe { rust_update_log_settings(crate_map, buf) } } } None => { diff --git a/src/libstd/rt/uv/uvll.rs b/src/libstd/rt/uv/uvll.rs index 62bf8f27af9..1f27a577684 100644 --- a/src/libstd/rt/uv/uvll.rs +++ b/src/libstd/rt/uv/uvll.rs @@ -382,12 +382,12 @@ pub unsafe fn as_sockaddr_in6(addr: *sockaddr) -> *sockaddr_in6 { } pub unsafe fn malloc_ip4_addr(ip: &str, port: int) -> *sockaddr_in { - do str::as_c_str(ip) |ip_buf| { + do ip.as_c_str |ip_buf| { rust_uv_ip4_addrp(ip_buf as *u8, port as libc::c_int) } } pub unsafe fn malloc_ip6_addr(ip: &str, port: int) -> *sockaddr_in6 { - do str::as_c_str(ip) |ip_buf| { + do ip.as_c_str |ip_buf| { rust_uv_ip6_addrp(ip_buf as *u8, port as libc::c_int) } } |
