user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std and rustc: Convert users of c_str to use .with_c_str

Browse source
This commit is contained in:
Erick Tryzelaar 2013-09-18 10:54:43 -07:00
parent a94158ce64
commit 4834661c66
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/middle/trans/base.rs
View file

@ -524,13 +524,13 @@ pub fn set_always_inline(f: ValueRef) {
}
pub fn set_fixed_stack_segment(f: ValueRef) {
do "fixed-stack-segment".to_c_str().with_ref |buf| {
do "fixed-stack-segment".with_c_str |buf| {
unsafe { llvm::LLVMAddFunctionAttrString(f, buf); }
}
}
pub fn set_no_split_stack(f: ValueRef) {
do "no-split-stack".to_c_str().with_ref |buf| {
do "no-split-stack".with_c_str |buf| {
unsafe { llvm::LLVMAddFunctionAttrString(f, buf); }
}
}

4
src/librustc/middle/trans/debuginfo.rs
View file

@ -781,7 +781,7 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
let ident = special_idents::type_self;
let param_metadata = do token::ident_to_str(&ident).to_c_str().with_ref |name| {
let param_metadata = do token::ident_to_str(&ident).with_c_str |name| {
unsafe {
llvm::LLVMDIBuilderCreateTemplateTypeParameter(
DIB(cx),
@ -819,7 +819,7 @@ pub fn create_function_debug_context(cx: &mut CrateContext,
// Again, only create type information if extra_debuginfo is enabled
if cx.sess.opts.extra_debuginfo {
let actual_type_metadata = type_metadata(cx, actual_type, codemap::dummy_sp());
let param_metadata = do token::ident_to_str(&ident).to_c_str().with_ref |name| {
let param_metadata = do token::ident_to_str(&ident).with_c_str |name| {
unsafe {
llvm::LLVMDIBuilderCreateTemplateTypeParameter(
DIB(cx),

4
src/librustc/middle/trans/foreign.rs
View file

@ -465,7 +465,7 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
// }
let the_block =
"the block".to_c_str().with_ref(
"the block".with_c_str(
|s| llvm::LLVMAppendBasicBlockInContext(ccx.llcx, llwrapfn, s));
let builder = ccx.builder.B;
@ -519,7 +519,7 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
None => {
let slot = {
"return_alloca".to_c_str().with_ref(
"return_alloca".with_c_str(
|s| llvm::LLVMBuildAlloca(builder,
llrust_ret_ty.to_ref(),
s))

4
src/libstd/rt/crate_map.rs
View file

@ -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()]

12
src/libstd/rt/logging.rs
View file

@ -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);

16
src/libstd/rt/uv/file.rs
View file

@ -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)
})