diff options
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/crate_map.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/logging.rs | 12 | ||||
| -rw-r--r-- | src/libstd/rt/uv/file.rs | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index 57abb7560a1..94d37f67ba1 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -209,7 +209,7 @@ fn iter_crate_map_follow_children() { let child_crate1 = CrateMapT2 { version: 1, entries: vec::raw::to_ptr([ - ModEntry { name: "t::f1".to_c_str().with_ref(|buf| buf), log_level: &mut 1}, + ModEntry { name: "t::f1".with_c_str(|buf| buf), log_level: &mut 1}, ModEntry { name: ptr::null(), log_level: ptr::mut_null()} ]), children: [&child_crate2 as *CrateMap, ptr::null()] @@ -219,7 +219,7 @@ fn iter_crate_map_follow_children() { let root_crate = CrateMapT2 { version: 1, entries: vec::raw::to_ptr([ - ModEntry { name: "t::f1".to_c_str().with_ref(|buf| buf), log_level: &mut 0}, + ModEntry { name: "t::f1".with_c_str(|buf| buf), log_level: &mut 0}, ModEntry { name: ptr::null(), log_level: ptr::mut_null()} ]), children: [child_crate1_ptr, ptr::null()] diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index cfbc53ad34e..abbcd27e8ca 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -294,7 +294,7 @@ fn update_entry_match_full_path() { LogDirective {name: Some(~"crate2"), level: 3}]; let level = &mut 0; unsafe { - do "crate1::mod1".to_c_str().with_ref |ptr| { + do "crate1::mod1".with_c_str |ptr| { let entry= &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == 2); @@ -310,7 +310,7 @@ fn update_entry_no_match() { LogDirective {name: Some(~"crate2"), level: 3}]; let level = &mut 0; unsafe { - do "crate3::mod1".to_c_str().with_ref |ptr| { + do "crate3::mod1".with_c_str |ptr| { let entry= &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == DEFAULT_LOG_LEVEL); @@ -326,7 +326,7 @@ fn update_entry_match_beginning() { LogDirective {name: Some(~"crate2"), level: 3}]; let level = &mut 0; unsafe { - do "crate2::mod1".to_c_str().with_ref |ptr| { + do "crate2::mod1".with_c_str |ptr| { let entry= &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == 3); @@ -343,7 +343,7 @@ fn update_entry_match_beginning_longest_match() { LogDirective {name: Some(~"crate2::mod"), level: 4}]; let level = &mut 0; unsafe { - do "crate2::mod1".to_c_str().with_ref |ptr| { + do "crate2::mod1".with_c_str |ptr| { let entry = &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == 4); @@ -360,13 +360,13 @@ fn update_entry_match_default() { ]; let level = &mut 0; unsafe { - do "crate1::mod1".to_c_str().with_ref |ptr| { + do "crate1::mod1".with_c_str |ptr| { let entry= &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == 2); assert!(m == 1); } - do "crate2::mod2".to_c_str().with_ref |ptr| { + do "crate2::mod2".with_c_str |ptr| { let entry= &ModEntry {name: ptr, log_level: level}; let m = update_entry(dirs, transmute(entry)); assert!(*entry.log_level == 3); diff --git a/src/libstd/rt/uv/file.rs b/src/libstd/rt/uv/file.rs index 54cb40c9873..fcd8800fadd 100644 --- a/src/libstd/rt/uv/file.rs +++ b/src/libstd/rt/uv/file.rs @@ -43,7 +43,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_open(loop_.native_handle(), self.native_handle(), p, flags, mode, complete_cb_ptr) }) @@ -57,7 +57,7 @@ impl FsRequest { me.req_boilerplate(None) }; let result = path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_open(loop_.native_handle(), self.native_handle(), p, flags, mode, complete_cb_ptr) }) @@ -71,7 +71,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_unlink(loop_.native_handle(), self.native_handle(), p, complete_cb_ptr) }) @@ -85,7 +85,7 @@ impl FsRequest { me.req_boilerplate(None) }; let result = path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_unlink(loop_.native_handle(), self.native_handle(), p, complete_cb_ptr) }) @@ -99,7 +99,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_stat(loop_.native_handle(), self.native_handle(), p, complete_cb_ptr) }) @@ -192,7 +192,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_mkdir(loop_.native_handle(), self.native_handle(), p, mode, complete_cb_ptr) }) @@ -205,7 +205,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_rmdir(loop_.native_handle(), self.native_handle(), p, complete_cb_ptr) }) @@ -219,7 +219,7 @@ impl FsRequest { me.req_boilerplate(Some(cb)) }; path.path_as_str(|p| { - p.to_c_str().with_ref(|p| unsafe { + p.with_c_str(|p| unsafe { uvll::fs_readdir(loop_.native_handle(), self.native_handle(), p, flags, complete_cb_ptr) }) |